Fix up some stuff, migrate to cleaned up chrome tabs

gui/bitmap_loader.py

@@ -20,6 +20,7 @@
 import io
 import os.path
 import zipfile
+from collections import OrderedDict
 
 # noinspection PyPackageRequirements
 import wx
@@ -29,23 +30,18 @@ import config
 from logbook import Logger
 logging = Logger(__name__)
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from .utils.compat import OrderedDict
-
 
 class BitmapLoader(object):
     try:
         archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
         logging.info("Using zipped image files.")
-    except IOError:
+    except (IOError, TypeError):
         logging.info("Using local image files.")
         archive = None
 
-    cachedBitmaps = OrderedDict()
-    dontUseCachedBitmaps = False
-    max_bmps = 500
+    cached_bitmaps = OrderedDict()
+    dont_use_cached_bitmaps = False
+    max_cached_bitmaps = 500
 
     @classmethod
     def getStaticBitmap(cls, name, parent, location):
@@ -55,25 +51,25 @@ class BitmapLoader(object):
 
     @classmethod
     def getBitmap(cls, name, location):
-        if cls.dontUseCachedBitmaps:
+        if cls.dont_use_cached_bitmaps:
             img = cls.getImage(name, location)
             if img is not None:
                 return img.ConvertToBitmap()
 
         path = "%s%s" % (name, location)
 
-        if len(cls.cachedBitmaps) == cls.max_bmps:
-            cls.cachedBitmaps.popitem(False)
+        if len(cls.cached_bitmaps) == cls.max_cached_bitmaps:
+            cls.cached_bitmaps.popitem(False)
 
-        if path not in cls.cachedBitmaps:
+        if path not in cls.cached_bitmaps:
             img = cls.getImage(name, location)
             if img is not None:
                 bmp = img.ConvertToBitmap()
             else:
                 bmp = None
-            cls.cachedBitmaps[path] = bmp
+            cls.cached_bitmaps[path] = bmp
         else:
-            bmp = cls.cachedBitmaps[path]
+            bmp = cls.cached_bitmaps[path]
 
         return bmp