Mercurial Repositories > eric / file comparison
comparison: eric6/eric6_diff.py
eric6/eric6_diff.py
- branch
- setup.py
- changeset 6949
- a5255f1ba3f0
- parent 6942
- 2602857055c5
- child 7192
- a22eee00b052
equal
deleted
inserted
replaced
| 6946:660757d6c57b | 6949:a5255f1ba3f0 |
|---|---|
| 12 version of the integrated Diff module. | 12 version of the integrated Diff module. |
| 13 """ | 13 """ |
| 14 | 14 |
| 15 from __future__ import unicode_literals | 15 from __future__ import unicode_literals |
| 16 | 16 |
| 17 import sys | |
| 18 import os | |
| 19 | |
| 20 sys.path.insert(1, os.path.dirname(__file__)) | |
| 21 | |
| 17 import Toolbox.PyQt4ImportHook # __IGNORE_WARNING__ | 22 import Toolbox.PyQt4ImportHook # __IGNORE_WARNING__ |
| 18 | 23 |
| 19 try: # Only for Py2 | 24 try: # Only for Py2 |
| 20 import Globals.compatibility_fixes # __IGNORE_WARNING__ | 25 import Globals.compatibility_fixes # __IGNORE_WARNING__ |
| 21 except (ImportError): | 26 except (ImportError): |
| 22 pass | 27 pass |
| 23 | |
| 24 import sys | |
| 25 import os | |
| 26 | 28 |
| 27 for arg in sys.argv[:]: | 29 for arg in sys.argv[:]: |
| 28 if arg.startswith("--config="): | 30 if arg.startswith("--config="): |
| 29 import Globals | 31 import Globals |
| 30 configDir = arg.replace("--config=", "") | 32 configDir = arg.replace("--config=", "") |
