LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

genPOI: Use "with" statement to close gzip files

Browse Source 
Previously, the files were not closed after reading or writing;
by using a "with" statement, the file handles will be closed as
soon as they go out of scope.

Possible fix for #1271.
This commit is contained in:
Nicolas F
2016-01-30 14:17:16 +01:00
parent c7f8cfee8c
commit 9fc050cf67
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
overviewer_core/aux_files/genPOI.py
View File

@@ -213,9 +213,10 @@ 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:
gz = gzip.GzipFile(cache_file) with 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", cache_file, len(cls.uuid_cache.keys())) logging.info("Loaded UUID cache from %r with %d entries",
cache_file, len(cls.uuid_cache.keys()))
except (ValueError, IOError): except (ValueError, IOError):
logging.warning("Failed to load UUID cache -- it might be corrupt") logging.warning("Failed to load UUID cache -- it might be corrupt")
cls.uuid_cache = {} cls.uuid_cache = {}
@@ -236,9 +237,10 @@ 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:
gz = gzip.GzipFile(cache_file_name, "wb") with 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", len(cls.uuid_cache.keys())) logging.info("Wrote UUID cache with %d entries",
len(cls.uuid_cache.keys()))
def __getitem__(self, item): def __getitem__(self, item):
if item == "EntityId": if item == "EntityId":