diff options
author | Johannes Berg <johannes.berg@intel.com> | 2019-08-22 21:46:27 +0200 |
---|---|---|
committer | Seth Forshee <seth.forshee@canonical.com> | 2019-10-29 08:50:53 -0500 |
commit | 651e39dee8605995b736b6056c6f7dc5c5a9c948 (patch) | |
tree | 4826ad615b8d5db5270d139a8eb0f0b3f3a455a9 | |
parent | 91b2b6795cb39e77145617aab2f591abf16582f1 (diff) | |
download | wireless-regdb-651e39dee8605995b736b6056c6f7dc5c5a9c948.tar.gz |
regdb: fix compatibility with python2
Various changes in the commit mentioned below broke
compatibility with python2. Restore it in a way that
makes it worth with both versions.
Fixes: f3c4969c2485 ("wireless-regdb: make scripts compatible with Python 3")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
-rwxr-xr-x | db2bin.py | 2 | ||||
-rwxr-xr-x | db2fw.py | 2 | ||||
-rwxr-xr-x | dbparse.py | 3 |
3 files changed, 3 insertions, 4 deletions
@@ -118,7 +118,7 @@ reg_country_ptr.set() for alpha2 in countrynames: coll = countries[alpha2] # struct regdb_file_reg_country - output.write(struct.pack('>BBxBI', alpha2[0], alpha2[1], coll.dfs_region, reg_rules_collections[coll.permissions])) + output.write(struct.pack('>2sxBI', alpha2, coll.dfs_region, reg_rules_collections[coll.permissions])) if len(sys.argv) > 3: @@ -85,7 +85,7 @@ countrynames = list(countries) countrynames.sort() for alpha2 in countrynames: coll = countries[alpha2] - output.write(struct.pack('>BB', alpha2[0], alpha2[1])) + output.write(struct.pack('>2s', alpha2)) country_ptrs[alpha2] = PTR(output) output.write(b'\x00' * 4) @@ -1,6 +1,5 @@ #!/usr/bin/env python -from builtins import bytes from functools import total_ordering import sys, math from math import ceil, log @@ -359,7 +358,7 @@ class DBParser(object): for cname in cnames: if len(cname) != 2: self._warn("country '%s' not alpha2" % cname) - cname = bytes(cname, 'ascii') + cname = cname.encode('ascii') if not cname in self._countries: self._countries[cname] = Country(dfs_region, comments=self._comments) self._current_countries[cname] = self._countries[cname] |