bugzilla: Break out __init__ bits to fix cyclic dependencies

crobinso · crobinso · commit 29b65a1eda34 · 2014-09-12T16:45:24.000-04:00
diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py
@@ -9,26 +9,21 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
-__version__ = "1.1.0"
-version = __version__
-
 import sys
-from logging import getLogger
 
 if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
     # pylint: disable=F0401
     from xmlrpc.client import Fault, ServerProxy
 else:
     from xmlrpclib import Fault, ServerProxy
 
-log = getLogger("bugzilla")
-
-
+from .apiversion import version, __version__
 from .base import BugzillaBase as _BugzillaBase
 from .base import BugzillaError
 from .base import RequestsTransport as _RequestsTransport
 from .bugzilla3 import Bugzilla3, Bugzilla32, Bugzilla34, Bugzilla36
 from .bugzilla4 import Bugzilla4, Bugzilla42, Bugzilla44
+from .logsetup import log
 from .rhbugzilla import RHBugzilla, RHBugzilla3, RHBugzilla4
 
 
diff --git a/bugzilla/apiversion.py b/bugzilla/apiversion.py
@@ -0,0 +1,11 @@
+#
+# Copyright (C) 2014 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+# the full text of the license.
+
+version = "1.1.0"
+__version__ = version
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -31,8 +31,9 @@
 
 import requests
 
-from . import __version__, log
+from .apiversion import __version__
 from .bug import _Bug, _User
+from .logsetup import log
 
 
 # Backwards compatibility
diff --git a/bugzilla/bug.py b/bugzilla/bug.py
@@ -12,7 +12,7 @@
 import locale
 import sys
 
-from . import log
+from .logsetup import log
 
 
 class _Bug(object):
diff --git a/bugzilla/logsetup.py b/bugzilla/logsetup.py
@@ -0,0 +1,11 @@
+#
+# Copyright (C) 2014 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+# the full text of the license.
+
+from logging import getLogger
+log = getLogger("bugzilla")
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
@@ -10,8 +10,8 @@
 # the full text of the license.
 
 
-from . import log
 from .bugzilla4 import Bugzilla44 as _parent
+from .logsetup import log
 
 
 class RHBugzilla(_parent):
diff --git a/setup.py b/setup.py
@@ -11,9 +11,9 @@
 
 
 def get_version():
-    f = open("bugzilla/__init__.py")
+    f = open("bugzilla/apiversion.py")
     for line in f:
-        if line.startswith('__version__'):
+        if line.startswith('version = '):
             return eval(line.split('=')[-1])
 
 
