Salastil/weather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Py3K compatibility for compressed correlation

Browse Source 
When run under Python 3.x, explicitly decode decompressed
bytestreams if reading pre-compressed correlation data files.
This commit is contained in:
Jeremy Stanley
2017-03-10 15:13:31 +00:00
parent 915f1b8d7d
commit 2a84a53f4a
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
weather.py
View File

@@ -744,7 +744,10 @@ def guess(
datafile = datafiles[dataname][0] datafile = datafiles[dataname][0]
if datafile.endswith(".gz"): if datafile.endswith(".gz"):
import gzip import gzip
stations.readfp( gzip.open(datafile) ) if pyversion("3"):
stations.read_string(
gzip.open(datafile).read().decode("utf-8") )
else: stations.readfp( gzip.open(datafile) )
else: else:
stations.read(datafile) stations.read(datafile)
else: else:
@@ -760,7 +763,9 @@ def guess(
datafile = datafiles[dataname][0] datafile = datafiles[dataname][0]
if datafile.endswith(".gz"): if datafile.endswith(".gz"):
import gzip import gzip
zones.readfp( gzip.open(datafile) ) if pyversion("3"):
zones.read_string( gzip.open(datafile).read().decode("utf-8") )
else: zones.readfp( gzip.open(datafile) )
else: else:
zones.read(datafile) zones.read(datafile)
else: else:
@@ -784,7 +789,10 @@ def guess(
datafile = datafiles[dataname][0] datafile = datafiles[dataname][0]
if datafile.endswith(".gz"): if datafile.endswith(".gz"):
import gzip import gzip
airports.readfp( gzip.open(datafile) ) if pyversion("3"):
airports.read_string(
gzip.open(datafile).read().decode("utf-8") )
else: airports.readfp( gzip.open(datafile) )
else: else:
airports.read(datafile) airports.read(datafile)
else: else:
@@ -870,7 +878,10 @@ def guess(
datafile = datafiles[dataname][0] datafile = datafiles[dataname][0]
if datafile.endswith(".gz"): if datafile.endswith(".gz"):
import gzip import gzip
zctas.readfp( gzip.open(datafile) ) if pyversion("3"):
zctas.read_string(
gzip.open(datafile).read().decode("utf-8") )
else: zctas.readfp( gzip.open(datafile) )
else: else:
zctas.read(datafile) zctas.read(datafile)
else: else:
@@ -925,7 +936,10 @@ def guess(
datafile = datafiles[dataname][0] datafile = datafiles[dataname][0]
if datafile.endswith(".gz"): if datafile.endswith(".gz"):
import gzip import gzip
places.readfp( gzip.open(datafile) ) if pyversion("3"):
places.read_string(
gzip.open(datafile).read().decode("utf-8") )
else: places.readfp( gzip.open(datafile) )
else: else:
places.read(datafile) places.read(datafile)
else: else: