Move _BugzillaTokenCache to _authfiles.py

crobinso · crobinso · commit 53c8aff55802 · 2020-01-05T16:16:36.000-05:00
Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/_authfiles.py b/bugzilla/_authfiles.py
@@ -8,7 +8,9 @@
 # pylint: disable=import-error,no-name-in-module,ungrouped-imports
 if sys.version_info[0] >= 3:
     from configparser import ConfigParser
+    from urllib.parse import urlparse  # pylint: disable=no-name-in-module
 else:
+    from urlparse import urlparse
     from ConfigParser import SafeConfigParser as ConfigParser
 # pylint: enable=import-error,no-name-in-module,ungrouped-imports
 
@@ -38,3 +40,46 @@ def open_bugzillarc(configpaths=-1):
 
     log.info("Found bugzillarc files: %s", read_files)
     return cfg
+
+
+class _BugzillaTokenCache(object):
+    """
+    Cache for tokens, including, with apologies for the duplicative
+    terminology, both Bugzilla Tokens and API Keys.
+    """
+
+    def __init__(self, uri, tokenfilename):
+        self.tokenfilename = tokenfilename
+        self.tokenfile = ConfigParser()
+        self.domain = urlparse(uri)[1]
+
+        if self.tokenfilename:
+            self.tokenfile.read(self.tokenfilename)
+
+        if self.domain not in self.tokenfile.sections():
+            self.tokenfile.add_section(self.domain)
+
+    @property
+    def value(self):
+        if self.tokenfile.has_option(self.domain, 'token'):
+            return self.tokenfile.get(self.domain, 'token')
+        else:
+            return None
+
+    @value.setter
+    def value(self, value):
+        if self.value == value:
+            return
+
+        if value is None:
+            self.tokenfile.remove_option(self.domain, 'token')
+        else:
+            self.tokenfile.set(self.domain, 'token', value)
+
+        if self.tokenfilename:
+            with open(self.tokenfilename, 'w') as tokenfile:
+                log.debug("Saving to tokenfile")
+                self.tokenfile.write(tokenfile)
+
+    def __repr__(self):
+        return '<Bugzilla Token Cache :: %s>' % self.value
diff --git a/bugzilla/transport.py b/bugzilla/transport.py
@@ -7,66 +7,22 @@
 
 # pylint: disable=import-error
 if sys.version_info[0] >= 3:
-    from configparser import ConfigParser
     from urllib.parse import urlparse  # pylint: disable=no-name-in-module
     from xmlrpc.client import Fault, ProtocolError, ServerProxy, Transport
 else:
-    from ConfigParser import SafeConfigParser as ConfigParser
     from urlparse import urlparse
     from xmlrpclib import Fault, ProtocolError, ServerProxy, Transport
 # pylint: enable=import-error
 
 import requests
 
+from ._authfiles import _BugzillaTokenCache
 from .exceptions import BugzillaError
 
 
 log = getLogger(__name__)
 
 
-class _BugzillaTokenCache(object):
-    """
-    Cache for tokens, including, with apologies for the duplicative
-    terminology, both Bugzilla Tokens and API Keys.
-    """
-
-    def __init__(self, uri, tokenfilename):
-        self.tokenfilename = tokenfilename
-        self.tokenfile = ConfigParser()
-        self.domain = urlparse(uri)[1]
-
-        if self.tokenfilename:
-            self.tokenfile.read(self.tokenfilename)
-
-        if self.domain not in self.tokenfile.sections():
-            self.tokenfile.add_section(self.domain)
-
-    @property
-    def value(self):
-        if self.tokenfile.has_option(self.domain, 'token'):
-            return self.tokenfile.get(self.domain, 'token')
-        else:
-            return None
-
-    @value.setter
-    def value(self, value):
-        if self.value == value:
-            return
-
-        if value is None:
-            self.tokenfile.remove_option(self.domain, 'token')
-        else:
-            self.tokenfile.set(self.domain, 'token', value)
-
-        if self.tokenfilename:
-            with open(self.tokenfilename, 'w') as tokenfile:
-                log.debug("Saving to tokenfile")
-                self.tokenfile.write(tokenfile)
-
-    def __repr__(self):
-        return '<Bugzilla Token Cache :: %s>' % self.value
-
-
 class _BugzillaSession(object):
     """
     Class to handle the backend agnostic 'requests' setup
