--- a/eric5_webbrowser.py Mon Oct 01 19:55:49 2012 +0200 +++ b/eric5_webbrowser.py Tue Oct 02 19:53:31 2012 +0200 @@ -17,9 +17,9 @@ for arg in sys.argv: if arg.startswith("--config="): - import Utilities + import Globals configDir = arg.replace("--config=", "") - Utilities.setConfigDir(configDir) + Globals.setConfigDir(configDir) sys.argv.remove(arg) break @@ -29,8 +29,10 @@ except ImportError: sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Pygments")) -from Utilities import Startup -import Utilities +import Globals +from Globals import AppInfo + +from Toolbox import Startup def createMainWidget(argv): @@ -68,13 +70,13 @@ "use the given directory as the one containing the config files"), ("--search=word", "search for the given word") ] - appinfo = Startup.makeAppInfo(sys.argv, + appinfo = AppInfo.makeAppInfo(sys.argv, "eric5 Web Browser", "file", "web browser", options) - if not Utilities.checkBlacklistedVersions(): + if not Globals.checkBlacklistedVersions(): sys.exit(100) res = Startup.simpleAppStartup(sys.argv,