Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Commit dc06a72

Browse files
author
Dane Springmeyer
committed
more python 3 fixes
1 parent 0c8e736 commit dc06a72

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

tile-info.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,7 @@ def stderr(*objs):
4949
stderr("opening %s as tile %d/%d/%d" % (filename, zoom, x, y))
5050
with open(filename, "rb") as f:
5151
tile = vector_tile_pb2.Tile()
52-
raw = f.read()
53-
try:
54-
decoded = raw.decode('zlib')
55-
if options.verbose:
56-
stderr("decoded zlib length:%d" % len(decoded))
57-
except:
58-
decoded = raw
52+
decoded = f.read()
5953

6054
tile.ParseFromString(decoded)
6155
req = renderer.Request(x,y,zoom)

tile-raw-info.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ def stderr(*objs):
3737

3838

3939
if __name__ == "__main__":
40-
sys.stderr = codecs.getwriter('utf8')(sys.stderr)
4140
usage = "usage: %prog "
4241
parser = OptionParser(usage=usage,
4342
description="Output information in a Mapnik vector tile.")
@@ -52,11 +51,7 @@ def stderr(*objs):
5251
filename = args[0]
5352
with open(filename, "rb") as f:
5453
tile = vector_tile_pb2.Tile()
55-
raw = f.read()
56-
try:
57-
decoded = raw.decode('zlib')
58-
except:
59-
decoded = raw
54+
decoded = f.read()
6055

6156
tile.ParseFromString(decoded)
6257

0 commit comments

Comments
 (0)