From ecbd5ca720ce28284280dc60013b3f60e9dd934f Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 20 Jun 2010 12:07:34 -0700 Subject: 3.0 prep Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/ast.py | 2 ++ bitbake/lib/bb/parse/parse_py/BBHandler.py | 9 +++++---- bitbake/lib/bb/parse/parse_py/__init__.py | 8 +++++--- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'bitbake/lib/bb/parse') diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 02d682d88f..dae2e11154 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 9708416a0a..bb56174881 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 a900101784..3e658d0de9 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' -- cgit v1.2.3-54-g00ecf