Skip to content

Commit

Permalink
Merge pull request #334 from methodstudios/fix/sip-import-order-swap-…
Browse files Browse the repository at this point in the history
…for-pyqt5.11+

fix: swap sip import order for pyqt5 to account for compat w private …
  • Loading branch information
mottosso committed Feb 10, 2020
2 parents 62dc86b + 8c9629a commit 4bcc646
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import importlib


__version__ = "1.2.3"
__version__ = "1.2.4"

# Enable support for `from Qt import *`
__all__ = []
Expand Down Expand Up @@ -1508,13 +1508,13 @@ def _pyqt5():
extras = ["uic"]

try:
import sip
# Relevant to PyQt5 5.11 and above
from PyQt5 import sip
extras += ["sip"]
except ImportError:

# Relevant to PyQt5 5.11 and above
try:
from PyQt5 import sip
import sip
extras += ["sip"]
except ImportError:
sip = None
Expand Down

0 comments on commit 4bcc646

Please sign in to comment.