fly/fgmeta
1
0
Fork 0
Code Activity

Catalogs: Python 3 compatibility for reading binary data.

Browse source 
IO data needs to be decoded, and the binary zip file needs to be opened in 'rb'
binary mode.
This commit is contained in:
Edward d'Auvergne 2019-11-18 10:26:40 +01:00
parent 185a10f7c5
commit ed7075f4ba
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
catalog/update-catalog.py
View file

@ -18,6 +18,9 @@ from catalog import make_aircraft_node, make_aircraft_zip, parse_config_file, pa
CATALOG_VERSION = 4 CATALOG_VERSION = 4
# The Python version.
PY_VERSION = sys.version_info[0]
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--update", help="Update/pull SCM source", parser.add_argument("--update", help="Update/pull SCM source",
action="store_true") action="store_true")
@ -45,6 +48,11 @@ def get_xml_text(e):
def last_change_date_svn(dir): def last_change_date_svn(dir):
command = [ 'svn', 'info', dir ] command = [ 'svn', 'info', dir ]
result = subprocess.check_output( command ) result = subprocess.check_output( command )
# Python 3 compatibility.
if PY_VERSION == 3:
result = result.decode('utf8')
match = re.search('Last Changed Date: (\d+)\-(\d+)\-(\d+)', result) match = re.search('Last Changed Date: (\d+)\-(\d+)\-(\d+)', result)
if match: if match:
rev_str = match.group(1) + match.group(2) + match.group(3) rev_str = match.group(1) + match.group(2) + match.group(3)
@ -70,7 +78,7 @@ def scan_dir_for_change_date_mtime(path):
def get_md5sum(file): def get_md5sum(file):
f = open(file, 'r') f = open(file, 'rb')
md5sum = hashlib.md5(f.read()).hexdigest() md5sum = hashlib.md5(f.read()).hexdigest()
f.close() f.close()
return md5sum return md5sum