Changeset 64 for protocols

Timestamp:

03/28/07 04:54:51 (22 months ago)

Author:

ploum

Message:

The Launchpad URL doesn't need anymore to end with "/".
This feature has to be implemented in each protocol if needed

Files:

• protocols/protocol_launchpadstaging_web.py (modified) (8 diffs)

protocols/protocol_launchpadstaging_web.py

@@ -19 +19 @@
                 #the user object contains login and password
                 self.user = manager
+                
+        def url(self):
+                zeurl = self.user.url()
+                if zeurl.endswith("/") :
+                        return zeurl
+                else :
+                        return "%s/" %zeurl
+                                        
+        def login(self) :
+                return self.user.login()
+                
+        def password(self) :
+                return self.user.password()
 
 # LAUNCHPAD protocol using the web : suboptimal
@@ -34 +47 @@
                 s3 = s2.strip().replace("&lt;","<")
                 return s3
+                
         
 ################INFORMATION ABOUT THE BTS ################################
@@ -65 +79 @@
                 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 # this is what you want to modify to support your own protocol
-                zeurl="%sbugs/%s" %(self.user.url(),str(nbr))
+                zeurl="%sbugs/%s" %(self.url(),str(nbr))
                 f= urllib.urlopen(zeurl)
                 # ici on a le corps principal
@@ -146 +160 @@
         def getBugUrl(self,nbr) :
                 bugnbr = str(nbr)
-                return "%sbugs/%s" %(self.user.url(),bugnbr)
+                return "%sbugs/%s" %(self.url(),bugnbr)
 
 
@@ -209 +223 @@
                 #inserting dummies bugs
                 plus = search_str.replace(" ","+")
-                zeurl="%sdistros/ubuntu/+bugs?field.searchtext=%s" %(self.user.url(),plus)
+                zeurl="%sdistros/ubuntu/+bugs?field.searchtext=%s" %(self.url(),plus)
                 f= urllib.urlopen(zeurl)
                 content=BeautifulSoup(f)
@@ -230 +244 @@
                 if search_str != None :
                         plus = search_str.replace(" ","+")
-                        zeurl="%sdistros/ubuntu/+source/%s/+bugs?field.searchtext=%s" %(self.user.url(),package,plus)
+                        zeurl="%sdistros/ubuntu/+source/%s/+bugs?field.searchtext=%s" %(self.url(),package,plus)
                 else :
-                        zeurl="%sdistros/ubuntu/+source/%s/+bugs" %(self.user.url(),package)
+                        zeurl="%sdistros/ubuntu/+source/%s/+bugs" %(self.url(),package)
                 f= urllib.urlopen(zeurl)
                 content=BeautifulSoup(f)
@@ -246 +260 @@
                 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 # this is what you want to modify to support your own protocol
-                zeurl="%sproducts/%s" %(self.user.url(),package)
+                zeurl="%sproducts/%s" %(self.url(),package)
                 f= urllib.urlopen(zeurl)
                 #ugly launchpad hack !
@@ -273 +287 @@
         # return a mechanize Browser object
         def __login(self):
-                urllog="%s+login" %self.user.url()
+                urllog="%s+login" %self.url()
                 br = Browser()
                 br.set_handle_robots(False)
                 br.open(urllog)
                 br.select_form(name="login")
-                br["loginpage_email"]=self.user.login()
-                br["loginpage_password"]=self.user.password()
+                br["loginpage_email"]=self.login()
+                br["loginpage_password"]=self.password()
                 response = br.submit()
                 return br
 
         def postComment(self,bugnbr,title,comment) :
-                urlcom="%sbugs/%s" %(self.user.url(),bugnbr)
+                urlcom="%sbugs/%s" %(self.url(),bugnbr)
                 br = self.__login()
                 br.open(urlcom)