Mercurial Repositories > eric / changeset
changeset
Redid the "import sip" statements for PyQt 5.11.
Sun, 24 Jun 2018 13:21:52 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 24 Jun 2018 13:21:52 +0200
- changeset 6365
- 85f8745427a6
- parent 6364
- 6a496f0886ad
- child 6366
- 6c1cd7e2902a
Redid 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 17:59:11 2018 +0200 +++ b/Globals/__init__.py Sun Jun 24 13:21:52 2018 +0200 @@ -109,9 +109,9 @@ # check version of sip try: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + 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 17:59:11 2018 +0200 +++ b/Helpviewer/HelpBrowserWV.py Sun Jun 24 13:21:52 2018 +0200 @@ -32,9 +32,9 @@ pass from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + import sip from E5Gui import E5MessageBox, E5FileDialog
--- a/Toolbox/PyQt4ImportHook.py Sat Jun 23 17:59:11 2018 +0200 +++ b/Toolbox/PyQt4ImportHook.py Sun Jun 24 13:21:52 2018 +0200 @@ -97,9 +97,9 @@ if sys.version_info[0] == 2: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + import sip sip.setapi('QString', 2) sip.setapi('QVariant', 2) sip.setapi('QTextStream', 2)
--- a/Tools/TrayStarter.py Sat Jun 23 17:59:11 2018 +0200 +++ b/Tools/TrayStarter.py Sun Jun 24 13:21:52 2018 +0200 @@ -516,9 +516,9 @@ try: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + 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 17:59:11 2018 +0200 +++ b/UI/UserInterface.py Sun Jun 24 13:21:52 2018 +0200 @@ -3246,9 +3246,9 @@ """ try: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + 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 17:59:11 2018 +0200 +++ b/Utilities/__init__.py Sun Jun 24 13:21:52 2018 +0200 @@ -1846,9 +1846,9 @@ """ try: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + 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 17:59:11 2018 +0200 +++ b/eric6.py Sun Jun 24 13:21:52 2018 +0200 @@ -34,9 +34,9 @@ try: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + import sip sip.setdestroyonexit(False) except AttributeError: pass
--- a/eric6_browser.py Sat Jun 23 17:59:11 2018 +0200 +++ b/eric6_browser.py Sun Jun 24 13:21:52 2018 +0200 @@ -23,9 +23,9 @@ try: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + import sip sip.setdestroyonexit(False) except AttributeError: pass
--- a/eric6_webbrowser.py Sat Jun 23 17:59:11 2018 +0200 +++ b/eric6_webbrowser.py Sun Jun 24 13:21:52 2018 +0200 @@ -23,9 +23,9 @@ try: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + import sip sip.setdestroyonexit(False) except AttributeError: pass
--- a/install-debugclients.py Sat Jun 23 17:59:11 2018 +0200 +++ b/install-debugclients.py Sun Jun 24 13:21:52 2018 +0200 @@ -15,9 +15,9 @@ try: import cStringIO as io try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + import sip sip.setapi('QString', 2) sip.setapi('QVariant', 2) sip.setapi('QTextStream', 2)
--- a/install.py Sat Jun 23 17:59:11 2018 +0200 +++ b/install.py Sun Jun 24 13:21:52 2018 +0200 @@ -14,9 +14,9 @@ # Python2 only import cStringIO as io try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + import sip sip.setapi('QString', 2) sip.setapi('QVariant', 2) sip.setapi('QTextStream', 2) @@ -1429,9 +1429,9 @@ # check version of sip try: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + 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 17:59:11 2018 +0200 +++ b/uninstall-debugclients.py Sun Jun 24 13:21:52 2018 +0200 @@ -19,9 +19,9 @@ if sys.version_info[0] == 2: try: - import sip + from PyQt5 import sip except ImportError: - from PyQt5 import sip + import sip sip.setapi('QString', 2) # Define the globals.
