bugzilla: Delete all non-public symbols from API import

crobinso · crobinso · commit b57042dac73e · 2016-05-23T19:56:24.000-04:00
Let's shake out any users that might be accessing stuff they
shouldn't be accessing.
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -14,7 +14,7 @@
 from __future__ import print_function
 
 import locale
-from logging import DEBUG, INFO, WARN, StreamHandler, Formatter
+from logging import getLogger, DEBUG, INFO, WARN, StreamHandler, Formatter
 import optparse
 import os
 import re
@@ -39,7 +39,7 @@ _is_unittest = bool(os.getenv("__BUGZILLA_UNITTEST"))
 cmdlist = ['login', 'new', 'query', 'modify', 'attach', 'info']
 format_field_re = re.compile("%{([a-z0-9_]+)(?::([^}]*))?}")
 
-log = bugzilla.log
+log = getLogger(bugzilla.__name__)
 handler = StreamHandler(sys.stderr)
 handler.setFormatter(Formatter(
     "[%(asctime)s] %(levelname)s (%(module)s:%(lineno)d) %(message)s",
diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py
@@ -26,31 +26,6 @@
         Bugzilla4, Bugzilla42, Bugzilla44,
         NovellBugzilla, RHBugzilla3, RHBugzilla4)
 
-log = getLogger(__name__)
-
-
-def _getBugzillaClassForURL(url, sslverify):
-    url = BugzillaBase.fix_url(url)
-    log.debug("Detecting subclass for %s", url)
-    s = ServerProxy(url, _RequestsTransport(url, sslverify=sslverify))
-
-    if "bugzilla.redhat.com" in url:
-        log.info("Using RHBugzilla for URL containing bugzilla.redhat.com")
-        return RHBugzilla
-    if "bugzilla.novell.com" in url:
-        log.info("Using NovellBugzilla for URL containing bugzilla.novell.com")
-        return NovellBugzilla
-
-    # Check for a Red Hat extension
-    try:
-        log.debug("Checking for Red Hat Bugzilla extension")
-        extensions = s.Bugzilla.extensions()
-        if extensions.get('extensions', {}).get('RedHat', False):
-            log.debug("Found RedHat bugzilla extension")
-            return RHBugzilla
-    except Fault:
-        pass
-
 
 class Bugzilla(BugzillaBase):
     '''
@@ -60,31 +35,47 @@ class Bugzilla(BugzillaBase):
     def _init_class_from_url(self, url, sslverify):
         if url is None:
             raise TypeError("You must pass a valid bugzilla URL")
+        url = RHBugzilla.fix_url(url)
+        log.debug("Detecting subclass for %s", url)
+
+        if "bugzilla.redhat.com" in url:
+            log.info("Using RHBugzilla for URL containing bugzilla.redhat.com")
+            c = RHBugzilla
+        else:
+            # Check for a Red Hat extension
+            s = ServerProxy(url, _RequestsTransport(url, sslverify=sslverify))
+            try:
+                extensions = s.Bugzilla.extensions()
+                if extensions.get('extensions', {}).get('RedHat', False):
+                    log.debug("Found RedHat bugzilla extension")
+                    c = RHBugzilla
+            except Fault:
+                pass
 
-        c = _getBugzillaClassForURL(url, sslverify)
         if not c:
-            return False
+            return
 
         self.__class__ = c
-        log.info("Chose subclass %s v%s", c.__name__, c.version)
+        log.info("Found subclass %s v%s", c.__name__, c.version)
         return True
 
 
-del(BugzillaBase)
-
-# This is the list of possible Bugzilla instances an app can use,
-# bin/bugzilla used to use it for the --bztype field
-classlist = [
-    "Bugzilla3", "Bugzilla32", "Bugzilla34", "Bugzilla36",
-    "Bugzilla4", "Bugzilla42", "Bugzilla44",
-    "RHBugzilla3", "RHBugzilla4", "RHBugzilla",
-    "NovellBugzilla",
-]
-
 # This is the public API. If you are explicitly instantiating any other
 # class, using some function, or poking into internal files, don't complain
 # if things break on you.
-__all__ = classlist + [
+__all__ = [
+    "Bugzilla3", "Bugzilla32", "Bugzilla34", "Bugzilla36",
+    "Bugzilla4", "Bugzilla42", "Bugzilla44",
+    "NovellBugzilla",
+    "RHBugzilla3", "RHBugzilla4", "RHBugzilla",
     'BugzillaError',
-    'Bugzilla',
+    'Bugzilla', "version",
 ]
+
+
+# Clear all other locals() from the public API
+for __sym in locals().copy():
+    if __sym.startswith("__") or __sym in __all__:
+        continue
+    locals().pop(__sym)
+locals().pop("__sym")
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,py34
+envlist = py27,py3
 
 [testenv]
 sitepackages = True
