summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2009-07-19 09:54:46 -0700
committerChris Larson <chris_larson@mentor.com>2010-02-19 11:04:40 -0700
commitb66c129edc7d78fed9d41b0c634744ec81931b21 (patch)
tree42b210b4c8234e9f8e0454697622d874ce06d007
parent867d36f9afce2d298874ac7563e5b3852ef04659 (diff)
downloadbitbake-b66c129edc7d78fed9d41b0c634744ec81931b21.tar.gz
Move compat imports in the bb package to avoid circular dep issues.
Signed-off-by: Chris Larson <clarson@kergoth.com>
-rw-r--r--lib/bb/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py
index de5f0321f..84116f4f6 100644
--- a/lib/bb/__init__.py
+++ b/lib/bb/__init__.py
@@ -80,11 +80,6 @@ if "BBDEBUG" in os.environ:
if level:
bb.msg.set_debug_level(level)
-# For compatibility
-from bb.fetch import MalformedUrl, encodeurl, decodeurl
-from bb.data import VarExpandError
-
-
#######################################################################
#######################################################################
#
@@ -1019,6 +1014,10 @@ def dep_opconvert(mysplit, myuse):
mypos += 1
return newsplit
+# For compatibility
+from bb.fetch import MalformedUrl, encodeurl, decodeurl
+from bb.data import VarExpandError
+
if __name__ == "__main__":
import doctest, bb
bb.msg.set_debug_level(0)