LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Revert "Merge remote-tracking branch 'exhuma/master', PR #963"

Browse Source 
This reverts commit e26727943f, reversing
changes made to 7bbb077704.
This commit is contained in:
Aaron Griffith
2013-12-02 07:40:00 -05:00
parent a8a2a191b8
commit df732bfa25
11 changed files with 165 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
overviewer_core/assetmanager.py
View File

@@ -27,10 +27,6 @@ import world
import util
from files import FileReplacer, mirror_dir
LOG = logging.getLogger(__name__)
class AssetManager(object):
"""\
These objects provide an interface to metadata and persistent data, and at the
@@ -55,8 +51,8 @@ directory.
self.overviewerConfig = json.loads(overviewerConfig_str)
except Exception, e:
if os.path.exists(os.path.join(self.outputdir, "overviewerConfig.js")):
LOG.warning("A previous overviewerConfig.js was found, but I couldn't read it for some reason. Continuing with a blank config")
LOG.debug(traceback.format_exc())
logging.warning("A previous overviewerConfig.js was found, but I couldn't read it for some reason. Continuing with a blank config")
logging.debug(traceback.format_exc())
self.overviewerConfig = dict(tilesets=dict())
# Make sure python knows the preferred encoding. If it does not, set it