Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers

This commit is contained in:
Ebag333
2017-02-11 11:51:53 -08:00
parent beed414429
commit 3b185e1bcb
50 changed files with 482 additions and 262 deletions

View File

@@ -27,6 +27,9 @@ import wx
import config
from logbook import Logger
logging = Logger(__name__)
try:
from collections import OrderedDict
except ImportError:
@@ -35,8 +38,10 @@ except ImportError:
class BitmapLoader(object):
try:
logging.info("Using zipped image files.")
archive = zipfile.ZipFile(config.getPyfaPath('imgs.zip'), 'r')
except IOError:
logging.info("Using local image files.")
archive = None
cachedBitmaps = OrderedDict()