Move compat imports in the bb package to avoid circular dep issues.

(Bitbake rev: b66c129edc7d78fed9d41b0c634744ec81931b21)

Signed-off-by: Chris Larson <clarson@kergoth.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index de5f0321fa2d046df2f771bfaaa05c552945b9d1..84116f4f6a87a11beaedf91b4b447026ef5886ad 100644 (file)
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/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)