Ticket #38303: IPython_external_qt.py.diff

IPython/external/qt.py

@@ -7 +7 @@
 """
 
 import os
+import distutils.version as DV
+VER_LT = lambda a,b: DV.LooseVersion(a) < DV.LooseVersion(b)
 
 # Available APIs.
 QT_API_PYQT = 'pyqt'
@@ -25 +27 @@
 if QT_API is None:
     try:
         import PySide
-        if PySide.__version__ < '1.0.3':
+        if VER_LT(PySide.__version__, '1.0.3'):
             # old PySide, fallback on PyQt
             raise ImportError
         from PySide import QtCore, QtGui, QtSvg
@@ -35 +37 @@
             prepare_pyqt4()
             import PyQt4
             from PyQt4 import QtCore, QtGui, QtSvg
-            if QtCore.PYQT_VERSION_STR < '4.7':
+            if VER_LT(QtCore.PYQT_VERSION_STR, '4.7'):
                 # PyQt 4.6 has issues with null strings returning as None
                 raise ImportError
             QT_API = QT_API_PYQT
@@ -49 +51 @@
 # Now peform the imports.
 if QT_API == QT_API_PYQT:
     from PyQt4 import QtCore, QtGui, QtSvg
-    if QtCore.PYQT_VERSION_STR < '4.7':
+    if VER_LT(QtCore.PYQT_VERSION_STR, '4.7'):
         raise ImportError("IPython requires PyQt4 >= 4.7, found %s"%QtCore.PYQT_VERSION_STR)
 
     # Alias PyQt-specific functions for PySide compatibility.
@@ -58 +60 @@
 
 elif QT_API == QT_API_PYSIDE:
     import PySide
-    if PySide.__version__ < '1.0.3':
+    if VER_LT(PySide.__version__, '1.0.3'):
         raise ImportError("IPython requires PySide >= 1.0.3, found %s"%PySide.__version__)
     from PySide import QtCore, QtGui, QtSvg