Mercurial Repositories > eric / file comparison
comparison: eric6/eric6.py
eric6/eric6.py
- changeset 7234
- b20fb38a6bfc
- parent 7229
- 53054eb5b15a
- child 7240
- 5d7a17a948ad
equal
deleted
inserted
replaced
| 7233:9cb57c5ee27d | 7234:b20fb38a6bfc |
|---|---|
| 24 if arg.split("=", 1)[0] in restartArgsList] | 24 if arg.split("=", 1)[0] in restartArgsList] |
| 25 | 25 |
| 26 sys.path.insert(1, os.path.dirname(__file__)) | 26 sys.path.insert(1, os.path.dirname(__file__)) |
| 27 | 27 |
| 28 try: | 28 try: |
| 29 from PyQt5.QtCore import pyqt5_enable_new_onexit_scheme | |
| 30 # __IGNORE_WARNING__ __IGNORE_EXCEPTION__ | |
| 31 except ImportError: | |
| 29 try: | 32 try: |
| 30 from PyQt5 import sip # __IGNORE_EXCEPTION__ | 33 try: |
| 31 except ImportError: | 34 from PyQt5 import sip # __IGNORE_EXCEPTION__ |
| 32 import sip | 35 except ImportError: |
| 33 sip.setdestroyonexit(False) | 36 import sip |
| 34 except AttributeError: | 37 sip.setdestroyonexit(False) |
| 35 pass | 38 except AttributeError: |
| 39 pass | |
| 36 | 40 |
| 37 import traceback | 41 import traceback |
| 38 import time | 42 import time |
| 39 import logging | 43 import logging |
| 40 import io | 44 import io |
