diff options
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/BBHandler.py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 9 |
1 files changed, 5 insertions, 4 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 | ||
28 | from __future__ import absolute_import | ||
28 | import re, bb, os | 29 | import re, bb, os |
29 | import bb.fetch, bb.build, bb.utils | 30 | import bb.fetch, bb.build, bb.utils |
30 | from bb import data | 31 | from bb import data |
31 | 32 | ||
32 | from ConfHandler import include, init | 33 | from . import ConfHandler |
33 | from bb.parse import resolve_file, ast | 34 | from .. import resolve_file, ast |
35 | from .ConfHandler import include, init | ||
34 | 36 | ||
35 | # For compatibility | 37 | # For compatibility |
36 | bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"]) | 38 | bb.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 |
238 | from bb.parse import handlers | 239 | from .. import handlers |
239 | handlers.append({'supports': supports, 'handle': handle, 'init': init}) | 240 | handlers.append({'supports': supports, 'handle': handle, 'init': init}) |
240 | del handlers | 241 | del handlers |