Handle soft dependency for wxPython properly, addresses #6

GUI.py

@@ -1,15 +1,17 @@
-import wx
-import wx.lib.scrolledpanel as scrolled
-import wx.richtext as rt
 import start
 import threading
 import time
 from networking import NetworkManager, PacketSenderManager
 import thread
 from threading import Lock
-
-#pydev error fix
+try:
+    import wx
+    import wx.lib.scrolledpanel as scrolled
+    import wx.richtext as rt
+    #Eclipse pyDev error fix
     wx=wx
+except ImportError:
+    pass
 
 connection = None
 

networking/NetworkManager.py

@@ -1,5 +1,4 @@
 import socket
-import wx
 import PacketListenerManager
 import urllib2
 import urllib
@@ -14,9 +13,12 @@ from Crypto.Util import asn1
 from Crypto.PublicKey import RSA
 from Crypto.Cipher import AES
 from Crypto.Cipher import PKCS1_v1_5
-
+try:
+    import wx
     #Eclipse pyDev error fix
     wx=wx
+except ImportError:
+    pass
 
 EntityID = 0
 

start.py

@@ -4,16 +4,16 @@ import getpass
 import sys
 from networking import PacketSenderManager, NetworkManager
 import NoGUIstuff
-import GUI
 import time
 import threading
-noGoooeees = False
+wxImportError = False
 try:
     import wx
+    import GUI
     wx = wx
 except ImportError:
     print "wxPython not found, falling back to no gui version"
-    noGoooeees = True
+    wxImportError = True
       
 class MinecraftLoginThread(threading.Thread):
     
@@ -97,8 +97,12 @@ class KeepConnectionAlive(threading.Thread):
                 self.window.parent.loggedIn = True            
 
 if __name__ == "__main__":
+    noGUI = False
     if (len(sys.argv) > 1):
-        if(sys.argv[1] == "nogui" or noGoooeees == True):
+        if (sys.argv.count("nogui") > 1) :
+            noGUI = True
+            
+    if(noGUI or wxImportError):
         user = raw_input("Enter your username: ")
         passwd = getpass.getpass("Enter your password: ")
         derp = NoGUIstuff.loginToMinecraft(user, passwd)