From b7d175a18a0fab65ff4022e15c68e079296c8e82 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 19 Jul 2009 09:54:46 -0700 Subject: Move compat imports in the bb package to avoid circular dep issues. (Bitbake rev: b66c129edc7d78fed9d41b0c634744ec81931b21) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/__init__.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'bitbake') 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) -- cgit v1.2.3