summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse/parse_py
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-06-20 12:07:34 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:37 +0100
commitecbd5ca720ce28284280dc60013b3f60e9dd934f (patch)
tree00759b5193c3aeea2f7213a8df8596f23ad1cbc5 /bitbake/lib/bb/parse/parse_py
parentef1de9ecaf73e28234d284b79ec45e084d0f0c53 (diff)
downloadpoky-ecbd5ca720ce28284280dc60013b3f60e9dd934f.tar.gz
3.0 prep
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py')
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py9
-rw-r--r--bitbake/lib/bb/parse/parse_py/__init__.py8
2 files changed, 10 insertions, 7 deletions
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 @@
25# with this program; if not, write to the Free Software Foundation, Inc., 25# with this program; if not, write to the Free Software Foundation, Inc.,
26# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 26# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
27 27
28from __future__ import absolute_import
28import re, bb, os 29import re, bb, os
29import bb.fetch, bb.build, bb.utils 30import bb.fetch, bb.build, bb.utils
30from bb import data 31from bb import data
31 32
32from ConfHandler import include, init 33from . import ConfHandler
33from bb.parse import resolve_file, ast 34from .. import resolve_file, ast
35from .ConfHandler import include, init
34 36
35# For compatibility 37# For compatibility
36bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"]) 38bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"])
@@ -231,10 +233,9 @@ def feeder(lineno, s, fn, root, statements):
231 ast.handleInherit(statements, m) 233 ast.handleInherit(statements, m)
232 return 234 return
233 235
234 from bb.parse import ConfHandler
235 return ConfHandler.feeder(lineno, s, fn, statements) 236 return ConfHandler.feeder(lineno, s, fn, statements)
236 237
237# Add us to the handlers list 238# Add us to the handlers list
238from bb.parse import handlers 239from .. import handlers
239handlers.append({'supports': supports, 'handle': handle, 'init': init}) 240handlers.append({'supports': supports, 'handle': handle, 'init': init})
240del handlers 241del 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.
25# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 25# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
26# 26#
27# Based on functions from the base bb module, Copyright 2003 Holger Schurig 27# Based on functions from the base bb module, Copyright 2003 Holger Schurig
28__version__ = '1.0'
29 28
30import ConfHandler 29from __future__ import absolute_import
31import BBHandler 30from . import ConfHandler
31from . import BBHandler
32
33__version__ = '1.0'