detect if we are in a pyinstaller bundle

lib/plugins.py

@@ -6,11 +6,11 @@ from i18n import _
 plugins = []
 
 
-def init_plugins(config):
+def init_plugins(config, local):
     import imp, pkgutil, __builtin__, os
     global plugins
 
-    if __builtin__.use_local_modules:
+    if local:
         fp, pathname, description = imp.find_module('plugins')
         plugin_names = [name for a, name, b in pkgutil.iter_modules([pathname])]
         plugin_names = filter( lambda name: os.path.exists(os.path.join(pathname,name+'.py')), plugin_names)

lib/util.py

@@ -66,7 +66,11 @@ def data_dir():
     if __builtin__.use_local_modules:
         return local_data_dir()
     else:
-        return appdata_dir()
+        if getattr(sys, 'frozen'):
+            basedir = sys._MEIPASS
+            return os.path.join(basedir, 'data')
+        else:
+            return appdata_dir()
 
 def usr_share_dir():
     return os.path.join(sys.prefix, "share")