diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-12 08:30:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-16 23:32:40 +0100 |
commit | bc8971d122a02ed823acf0758da267dccc584f98 (patch) | |
tree | dd97329507feb611e64fad7f46d97d657f23eae4 /bitbake/lib/bb/data_smart.py | |
parent | e2f4d9f1ec694768b223decb59a9c768a2da962d (diff) | |
download | poky-bc8971d122a02ed823acf0758da267dccc584f98.tar.gz |
bitbake: bitbake: Convert to python 3 megacommit This needs breaking up into smaller changes.
(Bitbake rev: cf51f19aed208a75d38c14cd585d9b9f115e3ba3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/data_smart.py')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 2ab884bb39..2a61386d89 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -372,7 +372,7 @@ class DataSmart(MutableMapping): | |||
372 | 372 | ||
373 | def expandWithRefs(self, s, varname): | 373 | def expandWithRefs(self, s, varname): |
374 | 374 | ||
375 | if not isinstance(s, basestring): # sanity check | 375 | if not isinstance(s, str): # sanity check |
376 | return VariableParse(varname, self, s) | 376 | return VariableParse(varname, self, s) |
377 | 377 | ||
378 | if varname and varname in self.expand_cache: | 378 | if varname and varname in self.expand_cache: |
@@ -966,4 +966,4 @@ class DataSmart(MutableMapping): | |||
966 | data.update({i:value}) | 966 | data.update({i:value}) |
967 | 967 | ||
968 | data_str = str([(k, data[k]) for k in sorted(data.keys())]) | 968 | data_str = str([(k, data[k]) for k in sorted(data.keys())]) |
969 | return hashlib.md5(data_str).hexdigest() | 969 | return hashlib.md5(data_str.encode("utf-8")).hexdigest() |