LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Initial Python 3 port

Browse Source 
Many things work, some don't. Notably, genPOI doesn't work, and
there's some signedness comparison stuff going on in the C extension.

This also completely drops support for Python 2, as maintaining a C
extension for both Python 2 and 3 is a pain and not worth it for the
9 months that Python 2 is still going to be supported upstream.

The documentation needs to be adjusted as well.

All of the few tests we have pass, and rendering a map works, both
with a configuration file and without. We can also use optimizeimages.

Concerns #1528.
This commit is contained in:
Nicolas F
2019-03-16 20:43:25 +01:00
parent 99eebd5b69
commit e348a548b6
33 changed files with 369 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
overviewer_core/world.py
View File

@@ -53,7 +53,7 @@ def log_other_exceptions(func):
return func(*args)
except ChunkDoesntExist:
raise
except Exception, e:
except Exception as e:
logging.exception("%s raised this exception", func.func_name)
raise
return newfunc
@@ -1139,7 +1139,7 @@ class RegionSet(object):
try:
region = self._get_regionobj(regionfile)
data = region.load_chunk(x, z)
except nbt.CorruptionError, e:
except nbt.CorruptionError as e:
tries -= 1
if tries > 0:
# Flush the region cache to possibly read a new region file
@@ -1251,7 +1251,7 @@ class RegionSet(object):
"""
for (regionx, regiony), (regionfile, filemtime) in self.regionfiles.iteritems():
for (regionx, regiony), (regionfile, filemtime) in self.regionfiles.items():
try:
mcr = self._get_regionobj(regionfile)
except nbt.CorruptRegionError:
@@ -1267,7 +1267,7 @@ class RegionSet(object):
"""
for (regionx, regiony), (regionfile, filemtime) in self.regionfiles.iteritems():
for (regionx, regiony), (regionfile, filemtime) in self.regionfiles.items():
""" SKIP LOADING A REGION WHICH HAS NOT BEEN MODIFIED! """
if (filemtime < mtime):
continue
@@ -1561,7 +1561,6 @@ def get_worlds():
"Returns {world # or name : level.dat information}"
ret = {}
save_dir = get_save_dir()
loc = locale.getpreferredencoding()
# No dirs found - most likely not running from inside minecraft-dir
if not save_dir is None:
@@ -1571,14 +1570,15 @@ def get_worlds():
if not os.path.exists(world_dat): continue
try:
info = nbt.load(world_dat)[1]
info['Data']['path'] = os.path.join(save_dir, dir).decode(loc)
info['Data']['path'] = os.path.join(save_dir, dir)
if 'LevelName' in info['Data'].keys():
ret[info['Data']['LevelName']] = info['Data']
except nbt.CorruptNBTError:
ret[os.path.basename(world_path).decode(loc) + " (corrupt)"] = {'path': world_path.decode(loc),
'LastPlayed': 0,
'Time': 0,
'IsCorrupt': True}
ret[os.path.basename(world_path) + " (corrupt)"] = {
'path': world_path,
'LastPlayed': 0,
'Time': 0,
'IsCorrupt': True}
for dir in os.listdir("."):