base: Change default cookie format back to Mozilla

crobinso · crobinso · commit 6d1bfe8f4c48 · 2013-06-18T14:36:46.000-04:00
We switched to LWP a long time ago to facilitate NovellBugzilla.
However I'm pretty sure that code doesn't work anymore, and a future
change is going to require us to carry cookies around in Mozilla
format.
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -63,7 +63,7 @@ def _decode_rfc2231_value(val):
 
 
 def _build_cookiejar(cookiefile):
-    cj = cookielib.LWPCookieJar(cookiefile)
+    cj = cookielib.MozillaCookieJar(cookiefile)
     if cookiefile is None:
         return cj
     if not os.path.exists(cookiefile):
@@ -73,22 +73,22 @@ def _build_cookiejar(cookiefile):
         cj.save()
         return cj
 
-    # We always want to use LWP cookies, but we previously accepted
-    # Mozilla cookies. If we see Mozilla, convert it to LWP
+    # We always want to use Mozilla cookies, but we previously accepted
+    # LWP cookies. If we see the latter, convert it to former
     try:
         cj.load()
         return cj
     except cookielib.LoadError:
         pass
 
     try:
-        cj = cookielib.MozillaCookieJar(cookiefile)
+        cj = cookielib.LWPCookieJar(cookiefile)
         cj.load()
     except cookielib.LoadError:
         raise BugzillaError("cookiefile=%s not in LWP or Mozilla format" %
                             cookiefile)
 
-    retcj = cookielib.LWPCookieJar(cookiefile)
+    retcj = cookielib.MozillaCookieJar(cookiefile)
     for cookie in cj:
         retcj.set_cookie(cookie)
     retcj.save()
diff --git a/tests/misc.py b/tests/misc.py
@@ -68,18 +68,17 @@ def testCookies(self):
         cookiesbad = os.path.join(os.getcwd(), "tests/data/cookies-bad.txt")
         cookieslwp = os.path.join(os.getcwd(), "tests/data/cookies-lwp.txt")
         cookiesmoz = os.path.join(os.getcwd(), "tests/data/cookies-moz.txt")
-        cookiesnewmoz = os.path.join(os.getcwd(),
-                                     "tests/data/cookies-moz.txt.new")
+        cookiesnew = cookieslwp + ".new"
 
         def cleanup():
-            if os.path.exists(cookiesnewmoz):
-                os.unlink(cookiesnewmoz)
+            if os.path.exists(cookiesnew):
+                os.unlink(cookiesnew)
         atexit.register(cleanup)
-        shutil.copy(cookiesmoz, cookiesnewmoz)
+        shutil.copy(cookieslwp, cookiesnew)
 
         # Mozilla should be converted inplace to LWP
-        bugzilla.Bugzilla3(url=None, cookiefile=cookiesnewmoz)
-        self.assertEquals(file(cookieslwp).read(), file(cookiesnewmoz).read())
+        bugzilla.Bugzilla3(url=None, cookiefile=cookiesnew)
+        self.assertEquals(file(cookiesmoz).read(), file(cookiesnew).read())
 
         # Make sure bad cookies raise an error
         try:
@@ -90,8 +89,8 @@ def cleanup():
             # Expected result
             pass
 
-        # LWP should 'just work'
-        bugzilla.Bugzilla3(url=None, cookiefile=cookieslwp)
+        # Mozilla should 'just work'
+        bugzilla.Bugzilla3(url=None, cookiefile=cookiesmoz)
 
     def testPostTranslation(self):
         def _testPostCompare(bz, indict, outexpect):
