LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

genpoi: Fix GzipFile closing on python 2.6

Browse Source 
Fixes #1275
This commit is contained in:
Nicolas F
2016-02-13 14:41:09 +01:00
parent 8f08b3b69f
commit 4e77ba8d13
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
overviewer_core/aux_files/genPOI.py
View File

@@ -27,6 +27,7 @@ import urllib2
import datetime import datetime
from collections import defaultdict from collections import defaultdict
from contextlib import closing
from multiprocessing import Pool from multiprocessing import Pool
from optparse import OptionParser from optparse import OptionParser
@@ -213,7 +214,7 @@ class PlayerDict(dict):
cache_file = os.path.join(outputdir, "uuidcache.dat") cache_file = os.path.join(outputdir, "uuidcache.dat")
if os.path.exists(cache_file): if os.path.exists(cache_file):
try: try:
with gzip.GzipFile(cache_file) as gz: with closing(gzip.GzipFile(cache_file)) as gz:
cls.uuid_cache = json.load(gz) cls.uuid_cache = json.load(gz)
logging.info("Loaded UUID cache from %r with %d entries", logging.info("Loaded UUID cache from %r with %d entries",
cache_file, len(cls.uuid_cache.keys())) cache_file, len(cls.uuid_cache.keys()))
@@ -237,7 +238,7 @@ class PlayerDict(dict):
cache_file = os.path.join(outputdir, "uuidcache.dat") cache_file = os.path.join(outputdir, "uuidcache.dat")
with FileReplacer(cache_file) as cache_file_name: with FileReplacer(cache_file) as cache_file_name:
with gzip.GzipFile(cache_file_name, "wb") as gz: with closing(gzip.GzipFile(cache_file_name, "wb")) as gz:
json.dump(cls.uuid_cache, gz) json.dump(cls.uuid_cache, gz)
logging.info("Wrote UUID cache with %d entries", logging.info("Wrote UUID cache with %d entries",
len(cls.uuid_cache.keys())) len(cls.uuid_cache.keys()))