summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2009-07-19 09:54:46 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-22 14:54:26 +0000
commitb7d175a18a0fab65ff4022e15c68e079296c8e82 (patch)
tree64076240e26e855942a38e3d33bd4cdaea8c2b1b
parentac392b66a545ae1c62b61817aa688304c4d56f09 (diff)
downloadopenembedded-core-b7d175a18a0fab65ff4022e15c68e079296c8e82.tar.gz
openembedded-core-b7d175a18a0fab65ff4022e15c68e079296c8e82.tar.bz2
openembedded-core-b7d175a18a0fab65ff4022e15c68e079296c8e82.zip
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>
-rw-r--r--bitbake/lib/bb/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index de5f0321fa..84116f4f6a 100644
--- 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)