quantum/punyverse
1
0
Fork 0
mirror of https://github.com/quantum5/punyverse.git synced 2025-04-24 13:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove self._phase completely.

Browse source
This commit is contained in:
Quantum 2018-08-23 22:27:23 -04:00
parent c205e1b0af
commit b197aac4e6
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
punyverse/world.py
View file

@ -1,16 +1,9 @@
from __future__ import division from __future__ import division
import json
import os import os
from collections import OrderedDict from collections import OrderedDict
try:
import json
except ImportError:
try:
import simplejson as json
except ImportError:
raise SystemExit('No JSON module found')
import six import six
try: try:
@ -39,7 +32,6 @@ class World(object):
self.callback = callback self.callback = callback
self.options = options or {} self.options = options or {}
self._phase = 'Parsing configuration...'
self._parse(file) self._parse(file)
del self.callback # So it can't be used after loading finishes del self.callback # So it can't be used after loading finishes
@ -55,7 +47,7 @@ class World(object):
return self._au return self._au
def _parse(self, file): def _parse(self, file):
self.callback(self._phase, 'Loading configuration file...', 0) self.callback('Parsing configuration...', 'Loading configuration file...', 0)
with open(os.path.join(os.path.dirname(__file__), file)) as f: with open(os.path.join(os.path.dirname(__file__), file)) as f:
root = json.load(f, object_pairs_hook=OrderedDict) root = json.load(f, object_pairs_hook=OrderedDict)
self._au = root.get('au', 2000) self._au = root.get('au', 2000)