Merge branch 'master' of https://github.com/manuelcortez/TWBlue

src/gui/main.py

@@ -33,7 +33,7 @@ import platform
 import urllib2
 import sysTrayIcon
 import switchModule
-from pubsub import pub
+from wx.lib.pubsub import pub
 import languageHandler
 from extra.autocompletionUsers import settings as autocompletionUsersSettings
 import pygeocoder

src/main.py

@@ -54,8 +54,8 @@ else:
  sys.stdout=stdout
  sys.stderr=stderr
    
-#app = wx.App()
-app = wx.App(redirect=True, useBestVisual=True, filename=paths.logs_path('tracebacks.log'))
+app = wx.App()
+#app = wx.App(redirect=True, useBestVisual=True, filename=paths.logs_path('tracebacks.log'))
 configured = False
 configs = []
 for i in os.listdir(paths.config_path()):

src/mysc/thread_utils.py

@@ -3,7 +3,7 @@ import threading
 import wx
 from twython import TwythonRateLimitError
 import time
-from pubsub import pub
+from wx.lib.pubsub import pub
 
 def call_threaded(func, *args, **kwargs):
  #Call the given function in a daemonized thread and return the thread.

src/setup.py

@@ -90,6 +90,7 @@ data_files = get_data(),
 options = {
    'py2exe': {   
     'optimize':2,
+   'packages': ["wx.lib.pubsub", "wx.lib.pubsub.core", "wx.lib.pubsub.core.kwargs"],
     'dll_excludes': ["MPR.dll", "api-ms-win-core-apiquery-l1-1-0.dll", "api-ms-win-core-console-l1-1-0.dll", "api-ms-win-core-delayload-l1-1-1.dll", "api-ms-win-core-errorhandling-l1-1-1.dll", "api-ms-win-core-file-l1-2-0.dll", "api-ms-win-core-handle-l1-1-0.dll", "api-ms-win-core-heap-obsolete-l1-1-0.dll", "api-ms-win-core-libraryloader-l1-1-1.dll", "api-ms-win-core-localization-l1-2-0.dll", "api-ms-win-core-processenvironment-l1-2-0.dll", "api-ms-win-core-processthreads-l1-1-1.dll", "api-ms-win-core-profile-l1-1-0.dll", "api-ms-win-core-registry-l1-1-0.dll", "api-ms-win-core-synch-l1-2-0.dll", "api-ms-win-core-sysinfo-l1-2-0.dll", "api-ms-win-security-base-l1-2-0.dll", "api-ms-win-core-heap-l1-2-0.dll", "api-ms-win-core-interlocked-l1-2-0.dll", "api-ms-win-core-localization-obsolete-l1-1-0.dll", "api-ms-win-core-string-l1-1-0.dll", "api-ms-win-core-string-obsolete-l1-1-0.dll", "WLDAP32.dll", "MSVCP90.dll", "MFC90.dll"],
     'skip_archive': True
    },