bugzilla: Remove overriding of unused 'version' field

crobinso · crobinso · commit 74cb2a3a485d · 2014-04-18T15:09:56.000-04:00
It's supposed to be the API class version, but I don't understand the
point and it's been almost entirely ignored.
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -253,10 +253,14 @@ class BugzillaBase(object):
         to ~/.bugzillacookies.  If set to None, the library won't save the
         cookies persistently.
     '''
+
+    # bugzilla version that the class is targetting. filled in by
+    # subclasses
     bz_ver_major = 0
     bz_ver_minor = 0
 
-    # This is the class API version
+    # Intended to be the API version of the class, but historically is
+    # unused and basically worthless since we don't plan on breaking API.
     version = "0.1"
 
     @staticmethod
@@ -374,8 +378,8 @@ def _init_private_data(self):
         self._components_details = {}
 
     def _get_user_agent(self):
-        ret = ('Python-urllib bugzilla.py/%s %s/%s' %
-               (__version__, str(self.__class__.__name__), self.version))
+        ret = ('Python-urllib bugzilla.py/%s %s' %
+               (__version__, str(self.__class__.__name__)))
         return ret
     user_agent = property(_get_user_agent)
 
diff --git a/bugzilla/bugzilla3.py b/bugzilla/bugzilla3.py
@@ -13,23 +13,19 @@
 
 
 class Bugzilla3(BugzillaBase):
-    version = '0.1'
     bz_ver_major = 3
     bz_ver_minor = 0
 
 
 class Bugzilla32(Bugzilla3):
-    version = '0.1'
     bz_ver_minor = 2
 
 
 class Bugzilla34(Bugzilla32):
-    version = '0.2'
     bz_ver_minor = 4
 
 
 class Bugzilla36(Bugzilla34):
-    version = '0.1'
     bz_ver_minor = 6
 
     def _getbugfields(self):
diff --git a/bugzilla/bugzilla4.py b/bugzilla/bugzilla4.py
@@ -12,9 +12,6 @@
 
 
 class Bugzilla4(Bugzilla36):
-    '''Concrete implementation of the Bugzilla protocol. This one uses the
-    methods provided by standard Bugzilla 4.0.x releases.'''
-    version = '0.1'
     bz_ver_major = 4
     bz_ver_minor = 0
 
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
@@ -29,7 +29,6 @@ class RHBugzilla(_parent):
     This class was written using bugzilla.redhat.com's API docs:
     https://bugzilla.redhat.com/docs/en/html/api/
     '''
-    version = '0.1'
 
     def __init__(self, *args, **kwargs):
         """
diff --git a/tests/misc.py b/tests/misc.py
@@ -65,8 +65,8 @@ def testUserAgent(self):
         b3 = bugzilla.Bugzilla3(url=None, cookiefile=None)
         rhbz = bugzilla.RHBugzilla(url=None, cookiefile=None)
 
-        self.assertTrue(b3.user_agent.endswith("Bugzilla3/0.1"))
-        self.assertTrue(rhbz.user_agent.endswith("RHBugzilla/0.1"))
+        self.assertTrue(b3.user_agent.endswith("Bugzilla3"))
+        self.assertTrue(rhbz.user_agent.endswith("RHBugzilla"))
 
     def testCookies(self):
         if (sys.version_info[0] < 2 or
