Refactoring order of module loading for better error reporting.

This commit is contained in:
Cas Cremers 2012-04-26 13:41:07 +02:00
parent 98dd606404
commit 5b985af776

View File

@ -19,23 +19,12 @@
""" """
#---------------------------------------------------------------------------
""" Import externals """
import sys
#---------------------------------------------------------------------------
""" Import scyther-gui components """
from Gui import About,Preference,Mainwindow
from Scyther import Scyther,Misc
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Try to get wxPython # Try to get wxPython
try: try:
import wx import wx
except ImportError: except ImportError:
from Scyther import Misc
Misc.panic(""" Misc.panic("""
ERROR: ERROR:
@ -51,13 +40,20 @@ Note that you can still use the Scyther binaries in the 'Scyther' directory.
""") """)
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
""" import externals """
import sys
import os import os
from optparse import OptionParser, SUPPRESS_HELP from optparse import OptionParser, SUPPRESS_HELP
from subprocess import * from subprocess import *
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
""" Import scyther-gui components """
from Scyther import Scyther,Misc
from Gui import About,Preference,Mainwindow
#---------------------------------------------------------------------------
def parseArgs(): def parseArgs():
usage = "usage: %s [options] [inputfile]" % sys.argv[0] usage = "usage: %s [options] [inputfile]" % sys.argv[0]
description = "scyther-gui is a graphical user interface for the scyther protocol verification tool." description = "scyther-gui is a graphical user interface for the scyther protocol verification tool."