Mercurial Repositories > eric / file comparison
comparison: eric5.py
eric5.py
- branch
- Py2 comp.
- changeset 2677
- 3d4277929fb3
- parent 2538
- b2642e7a4c18
- parent 2664
- 56add695787e
- child 2791
- a9577f248f04
equal
deleted
inserted
replaced
| 2670:e60ea6cb8e11 | 2677:3d4277929fb3 |
|---|---|
| 52 Globals.setConfigDir(configDir) | 52 Globals.setConfigDir(configDir) |
| 53 sys.argv.remove(arg) | 53 sys.argv.remove(arg) |
| 54 break | 54 break |
| 55 | 55 |
| 56 # make Third-Party package available as a packages repository | 56 # make Third-Party package available as a packages repository |
| 57 try: | 57 sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Pygments")) |
| 58 import pygments # __IGNORE_EXCEPTION__ __IGNORE_WARNING__ | |
| 59 except ImportError: | |
| 60 sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Pygments")) | |
| 61 | 58 |
| 62 from E5Gui.E5Application import E5Application | 59 from E5Gui.E5Application import E5Application |
| 63 | 60 |
| 64 | 61 |
| 65 def handleSingleApplication(ddindex): | 62 def handleSingleApplication(ddindex): |
| 216 splash = NoneSplashScreen() | 213 splash = NoneSplashScreen() |
| 217 else: | 214 else: |
| 218 splash = SplashScreen() | 215 splash = SplashScreen() |
| 219 | 216 |
| 220 # modify the executable search path for the PyQt4 installer | 217 # modify the executable search path for the PyQt4 installer |
| 221 try: | 218 if Globals.isWindowsPlatform(): |
| 222 from PyQt4 import pyqtconfig | 219 pyqtDataDir = Globals.getPyQt4ModulesDirectory() |
| 223 pyqtDataDir = pyqtconfig._pkg_config["pyqt_mod_dir"] | |
| 224 if os.path.exists(os.path.join(pyqtDataDir, "bin")): | 220 if os.path.exists(os.path.join(pyqtDataDir, "bin")): |
| 225 path = os.path.join(pyqtDataDir, "bin") + os.pathsep + os.environ["PATH"] | 221 path = os.path.join(pyqtDataDir, "bin") + os.pathsep + os.environ["PATH"] |
| 226 else: | 222 else: |
| 227 path = pyqtDataDir + os.pathsep + os.environ["PATH"] | 223 path = pyqtDataDir + os.pathsep + os.environ["PATH"] |
| 228 os.environ["PATH"] = path | 224 os.environ["PATH"] = path |
| 229 except (AttributeError, ImportError): | |
| 230 pass | |
| 231 | 225 |
| 232 pluginFile = None | 226 pluginFile = None |
| 233 noopen = False | 227 noopen = False |
| 234 if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex: | 228 if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex: |
| 235 del sys.argv[sys.argv.index("--noopen")] | 229 del sys.argv[sys.argv.index("--noopen")] |
