diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-12 08:14:11 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:33 +0100 |
commit | 22a21799059b156d8858cbf32acb7c2aefb9a23b (patch) | |
tree | 1e0e83c86fe04e30576ddfb34577940596f8d809 /bitbake/lib/bb/data.py | |
parent | 1180bab54e2879401f3586c91a48174191a1ee8b (diff) | |
download | poky-22a21799059b156d8858cbf32acb7c2aefb9a23b.tar.gz |
Kill unnecessary usages of the types module
types.IntType -> int
types.StringType -> basestring
...
Also moves our ImmutableTypes tuple into our own namespace.
(Bitbake rev: 83674a3a5564ecb1f9d2c9b2d5b1eeb3c31272ab)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/data.py')
-rw-r--r-- | bitbake/lib/bb/data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index e401c53429..ba496c9d93 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
@@ -37,7 +37,7 @@ the speed is more critical here. | |||
37 | # | 37 | # |
38 | #Based on functions from the base bb module, Copyright 2003 Holger Schurig | 38 | #Based on functions from the base bb module, Copyright 2003 Holger Schurig |
39 | 39 | ||
40 | import sys, os, re, types | 40 | import sys, os, re |
41 | if sys.argv[0][-5:] == "pydoc": | 41 | if sys.argv[0][-5:] == "pydoc": |
42 | path = os.path.dirname(os.path.dirname(sys.argv[1])) | 42 | path = os.path.dirname(os.path.dirname(sys.argv[1])) |
43 | else: | 43 | else: |
@@ -193,7 +193,7 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): | |||
193 | if all: | 193 | if all: |
194 | o.write('# %s=%s\n' % (var, oval)) | 194 | o.write('# %s=%s\n' % (var, oval)) |
195 | 195 | ||
196 | if not isinstance(val, types.StringType): | 196 | if not isinstance(val, basestring): |
197 | return 0 | 197 | return 0 |
198 | 198 | ||
199 | if (var.find("-") != -1 or var.find(".") != -1 or var.find('{') != -1 or var.find('}') != -1 or var.find('+') != -1) and not all: | 199 | if (var.find("-") != -1 or var.find(".") != -1 or var.find('{') != -1 or var.find('}') != -1 or var.find('+') != -1) and not all: |