diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-08 10:22:29 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:32 +0100 |
commit | 1c74fd768f8e4f5778411538b906cdcc22fe3f67 (patch) | |
tree | 3d3a5f1021276055f91322afa64a9eee53d3cc9f /bitbake/lib/bb/parse | |
parent | 7acc132cac873e60005516272473a55a8160b9c4 (diff) | |
download | poky-1c74fd768f8e4f5778411538b906cdcc22fe3f67.tar.gz |
Import fixups
(Bitbake rev: 4fa052f426e3205ebace713eaa22deddc0420e8a)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
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 | 1 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 6d4f285626..a586c5cde1 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -22,6 +22,7 @@ | |||
22 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 22 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
23 | 23 | ||
24 | import bb, re, string | 24 | import bb, re, string |
25 | from bb import methodpool | ||
25 | from itertools import chain | 26 | from itertools import chain |
26 | 27 | ||
27 | __word__ = re.compile(r"\S+") | 28 | __word__ = re.compile(r"\S+") |
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index f9f185ff71..c053b5bfdf 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -25,12 +25,12 @@ | |||
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 | import re, bb, os, sys, time, string | 28 | import re, bb, os |
29 | import bb.fetch, bb.build, bb.utils | 29 | import bb.fetch, bb.build, bb.utils |
30 | from bb import data, fetch | 30 | from bb import data |
31 | 31 | ||
32 | from ConfHandler import include, init | 32 | from ConfHandler import include, init |
33 | from bb.parse import ParseError, resolve_file, ast | 33 | from bb.parse import resolve_file, ast |
34 | 34 | ||
35 | # For compatibility | 35 | # For compatibility |
36 | from bb.parse import vars_from_file | 36 | from bb.parse import vars_from_file |
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index e50acbe5e1..8e17182ba7 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
@@ -24,7 +24,7 @@ | |||
24 | # with this program; if not, write to the Free Software Foundation, Inc., | 24 | # with this program; if not, write to the Free Software Foundation, Inc., |
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 | import re, bb.data, os, sys | 27 | import re, bb.data, os |
28 | import bb.utils | 28 | import bb.utils |
29 | from bb.parse import ParseError, resolve_file, ast | 29 | from bb.parse import ParseError, resolve_file, ast |
30 | 30 | ||