diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-06-20 12:07:34 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:37 +0100 |
| commit | ecbd5ca720ce28284280dc60013b3f60e9dd934f (patch) | |
| tree | 00759b5193c3aeea2f7213a8df8596f23ad1cbc5 /bitbake/lib/bb/parse | |
| parent | ef1de9ecaf73e28234d284b79ec45e084d0f0c53 (diff) | |
| download | openembedded-core-ecbd5ca720ce28284280dc60013b3f60e9dd934f.tar.gz openembedded-core-ecbd5ca720ce28284280dc60013b3f60e9dd934f.tar.bz2 openembedded-core-ecbd5ca720ce28284280dc60013b3f60e9dd934f.tar.xz openembedded-core-ecbd5ca720ce28284280dc60013b3f60e9dd934f.zip | |
3.0 prep
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse')
| -rw-r--r-- | bitbake/lib/bb/parse/ast.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 9 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/__init__.py | 8 |
3 files changed, 12 insertions, 7 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 02d682d88..dae2e1115 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py @@ -21,6 +21,8 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +from __future__ import absolute_import +from future_builtins import filter import bb, re, string from bb import methodpool import itertools diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 9708416a0..bb5617488 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -25,12 +25,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +from __future__ import absolute_import import re, bb, os import bb.fetch, bb.build, bb.utils from bb import data -from ConfHandler import include, init -from bb.parse import resolve_file, ast +from . import ConfHandler +from .. import resolve_file, ast +from .ConfHandler import include, init # For compatibility bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"]) @@ -231,10 +233,9 @@ def feeder(lineno, s, fn, root, statements): ast.handleInherit(statements, m) return - from bb.parse import ConfHandler return ConfHandler.feeder(lineno, s, fn, statements) # Add us to the handlers list -from bb.parse import handlers +from .. import handlers handlers.append({'supports': supports, 'handle': handle, 'init': init}) del handlers diff --git a/bitbake/lib/bb/parse/parse_py/__init__.py b/bitbake/lib/bb/parse/parse_py/__init__.py index a90010178..3e658d0de 100644 --- a/bitbake/lib/bb/parse/parse_py/__init__.py +++ b/bitbake/lib/bb/parse/parse_py/__init__.py @@ -25,7 +25,9 @@ File parsers for the BitBake build tools. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # Based on functions from the base bb module, Copyright 2003 Holger Schurig -__version__ = '1.0' -import ConfHandler -import BBHandler +from __future__ import absolute_import +from . import ConfHandler +from . import BBHandler + +__version__ = '1.0' |