Mercurial Repositories > eric / changeset
changeset
Prepared the "import sip" statements for PyQt 5.11.
Sat, 23 Jun 2018 17:59:11 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 23 Jun 2018 17:59:11 +0200
- changeset 6364
- 6a496f0886ad
- parent 6363
- 30ba1d9bd841
- child 6365
- 85f8745427a6
Prepared the "import sip" statements for PyQt 5.11.
| Globals/__init__.py | file | annotate | diff | comparison | revisions | |
| Helpviewer/HelpBrowserWV.py | file | annotate | diff | comparison | revisions | |
| Toolbox/PyQt4ImportHook.py | file | annotate | diff | comparison | revisions | |
| Tools/TrayStarter.py | file | annotate | diff | comparison | revisions | |
| UI/UserInterface.py | file | annotate | diff | comparison | revisions | |
| Utilities/__init__.py | file | annotate | diff | comparison | revisions | |
| eric6.py | file | annotate | diff | comparison | revisions | |
| eric6_browser.py | file | annotate | diff | comparison | revisions | |
| eric6_webbrowser.py | file | annotate | diff | comparison | revisions | |
| install-debugclients.py | file | annotate | diff | comparison | revisions | |
| install.py | file | annotate | diff | comparison | revisions | |
| uninstall-debugclients.py | file | annotate | diff | comparison | revisions | |
| uninstall.py | file | annotate | diff | comparison | revisions |
--- a/Globals/__init__.py Sat Jun 23 15:29:15 2018 +0200 +++ b/Globals/__init__.py Sat Jun 23 17:59:11 2018 +0200 @@ -108,7 +108,10 @@ # check version of sip try: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sipVersion = sip.SIP_VERSION_STR # always assume, that snapshots are good if "snapshot" not in sipVersion:
--- a/Helpviewer/HelpBrowserWV.py Sat Jun 23 15:29:15 2018 +0200 +++ b/Helpviewer/HelpBrowserWV.py Sat Jun 23 17:59:11 2018 +0200 @@ -31,7 +31,10 @@ except ImportError: pass from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest -import sip +try: + import sip +except ImportError: + from PyQt5 import sip from E5Gui import E5MessageBox, E5FileDialog
--- a/Toolbox/PyQt4ImportHook.py Sat Jun 23 15:29:15 2018 +0200 +++ b/Toolbox/PyQt4ImportHook.py Sat Jun 23 17:59:11 2018 +0200 @@ -96,7 +96,10 @@ sys.meta_path.insert(0, PyQt4Importer()) if sys.version_info[0] == 2: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip.setapi('QString', 2) sip.setapi('QVariant', 2) sip.setapi('QTextStream', 2)
--- a/Tools/TrayStarter.py Sat Jun 23 15:29:15 2018 +0200 +++ b/Tools/TrayStarter.py Sat Jun 23 17:59:11 2018 +0200 @@ -515,7 +515,10 @@ from PyQt5.Qsci import QSCINTILLA_VERSION_STR try: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip_version_str = sip.SIP_VERSION_STR except (ImportError, AttributeError): sip_version_str = "sip version not available"
--- a/UI/UserInterface.py Sat Jun 23 15:29:15 2018 +0200 +++ b/UI/UserInterface.py Sat Jun 23 17:59:11 2018 +0200 @@ -3245,7 +3245,10 @@ Private slot to handle the Versions dialog. """ try: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip_version_str = sip.SIP_VERSION_STR except (ImportError, AttributeError): sip_version_str = "sip version not available"
--- a/Utilities/__init__.py Sat Jun 23 15:29:15 2018 +0200 +++ b/Utilities/__init__.py Sat Jun 23 17:59:11 2018 +0200 @@ -1845,7 +1845,10 @@ @return string with version infos (string) """ try: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip_version_str = sip.SIP_VERSION_STR except (ImportError, AttributeError): sip_version_str = "sip version not available"
--- a/eric6.py Sat Jun 23 15:29:15 2018 +0200 +++ b/eric6.py Sat Jun 23 17:59:11 2018 +0200 @@ -33,7 +33,10 @@ basestring = str try: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip.setdestroyonexit(False) except AttributeError: pass
--- a/eric6_browser.py Sat Jun 23 15:29:15 2018 +0200 +++ b/eric6_browser.py Sat Jun 23 17:59:11 2018 +0200 @@ -22,7 +22,10 @@ pass try: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip.setdestroyonexit(False) except AttributeError: pass
--- a/eric6_webbrowser.py Sat Jun 23 15:29:15 2018 +0200 +++ b/eric6_webbrowser.py Sat Jun 23 17:59:11 2018 +0200 @@ -22,7 +22,10 @@ pass try: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip.setdestroyonexit(False) except AttributeError: pass
--- a/install-debugclients.py Sat Jun 23 15:29:15 2018 +0200 +++ b/install-debugclients.py Sat Jun 23 17:59:11 2018 +0200 @@ -14,7 +14,10 @@ from __future__ import unicode_literals, print_function try: import cStringIO as io - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip.setapi('QString', 2) sip.setapi('QVariant', 2) sip.setapi('QTextStream', 2)
--- a/install.py Sat Jun 23 15:29:15 2018 +0200 +++ b/install.py Sat Jun 23 17:59:11 2018 +0200 @@ -13,7 +13,10 @@ try: # Python2 only import cStringIO as io - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip.setapi('QString', 2) sip.setapi('QVariant', 2) sip.setapi('QTextStream', 2) @@ -1425,7 +1428,10 @@ # check version of sip try: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sipVersion = sip.SIP_VERSION_STR print("sip Version:", sipVersion.strip()) # always assume, that snapshots or dev versions are new enough
--- a/uninstall-debugclients.py Sat Jun 23 15:29:15 2018 +0200 +++ b/uninstall-debugclients.py Sat Jun 23 17:59:11 2018 +0200 @@ -18,7 +18,10 @@ import distutils.sysconfig if sys.version_info[0] == 2: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip.setapi('QString', 2) # Define the globals.
--- a/uninstall.py Sat Jun 23 15:29:15 2018 +0200 +++ b/uninstall.py Sat Jun 23 17:59:11 2018 +0200 @@ -19,7 +19,10 @@ import distutils.sysconfig if sys.version_info[0] == 2: - import sip + try: + import sip + except ImportError: + from PyQt5 import sip sip.setapi('QString', 2) else: raw_input = input
