diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-10 16:27:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-14 23:05:15 +0100 |
commit | 3249e33251102069c88e2bc3f703cfab51444668 (patch) | |
tree | 77b5ea5d17a2cfaaf612c7f058fedf25574a9b30 /bitbake/lib/toaster/toastermain | |
parent | bfc21fd9b23ff62c1dc422b606b289f2457f29e5 (diff) | |
download | poky-3249e33251102069c88e2bc3f703cfab51444668.tar.gz |
bitbake: toaster: use 'in' instead of has_key
Dictionary method has_key is deprecated in python 2 and absent
in python 3.
Used '<key> in <dict>' statement to make the code working on
both python 2 and python 3.
[YOCTO #9584]
(Bitbake rev: 3d7ad7ba0d1a6f688ae885817c049f2a8ced11b5)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastermain')
-rw-r--r-- | bitbake/lib/toaster/toastermain/settings.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastermain/urls.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index 8662f393a9..78702fa59e 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py | |||
@@ -321,7 +321,7 @@ currentdir = os.path.dirname(__file__) | |||
321 | for t in os.walk(os.path.dirname(currentdir)): | 321 | for t in os.walk(os.path.dirname(currentdir)): |
322 | modulename = os.path.basename(t[0]) | 322 | modulename = os.path.basename(t[0]) |
323 | #if we have a virtualenv skip it to avoid incorrect imports | 323 | #if we have a virtualenv skip it to avoid incorrect imports |
324 | if os.environ.has_key('VIRTUAL_ENV') and os.environ['VIRTUAL_ENV'] in t[0]: | 324 | if 'VIRTUAL_ENV' in os.environ and os.environ['VIRTUAL_ENV'] in t[0]: |
325 | continue | 325 | continue |
326 | 326 | ||
327 | if ("views.py" in t[2] or "models.py" in t[2]) and not modulename in INSTALLED_APPS: | 327 | if ("views.py" in t[2] or "models.py" in t[2]) and not modulename in INSTALLED_APPS: |
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index 530a42ffab..1f8599edc3 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py | |||
@@ -71,7 +71,7 @@ import os | |||
71 | currentdir = os.path.dirname(__file__) | 71 | currentdir = os.path.dirname(__file__) |
72 | for t in os.walk(os.path.dirname(currentdir)): | 72 | for t in os.walk(os.path.dirname(currentdir)): |
73 | #if we have a virtualenv skip it to avoid incorrect imports | 73 | #if we have a virtualenv skip it to avoid incorrect imports |
74 | if os.environ.has_key('VIRTUAL_ENV') and os.environ['VIRTUAL_ENV'] in t[0]: | 74 | if 'VIRTUAL_ENV' in os.environ and os.environ['VIRTUAL_ENV'] in t[0]: |
75 | continue | 75 | continue |
76 | 76 | ||
77 | if "urls.py" in t[2] and t[0] != currentdir: | 77 | if "urls.py" in t[2] and t[0] != currentdir: |