[Python-modules-commits] r21754 - in packages/ipython/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Monday, May 14, 2012 @ 20:35:06
  Author: jtaylor-guest
Revision: 21754

add full-qt-imports.patch (Closes: #671363)

avoids choosing an incomplete qt version if a full one is available

Added:
  packages/ipython/trunk/debian/patches/full-qt-imports.patch
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/series

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-05-14 20:34:50 UTC (rev 21753)
+++ packages/ipython/trunk/debian/changelog	2012-05-14 20:35:06 UTC (rev 21754)
@@ -7,8 +7,10 @@
     prefer local mathjax installation over the system one
   * add parallel-2to3.patch:
     allow running 2to3 in parallel. Thanks to Jakub Wilk for the patch
+  * add full-qt-imports.patch: (Closes: #671363)
+    avoids choosing an incomplete qt version if a full one is available
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Mon, 14 May 2012 22:13:35 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Mon, 14 May 2012 22:17:17 +0200
 
 ipython (0.12.1+dfsg-1) unstable; urgency=low
 

Added: packages/ipython/trunk/debian/patches/full-qt-imports.patch
===================================================================
--- packages/ipython/trunk/debian/patches/full-qt-imports.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/full-qt-imports.patch	2012-05-14 20:35:06 UTC (rev 21754)
@@ -0,0 +1,22 @@
+Description: try importing needed qt modules before choosing a framework
+ avoids choosing an incomplete qt version if a full one is available
+Applied-Upstream: 0.13
+Forwarded: https://github.com/ipython/ipython/pull/1704
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671363
+--- a/IPython/external/qt.py
++++ b/IPython/external/qt.py
+@@ -28,12 +28,13 @@
+         if PySide.__version__ < '1.0.3':
+             # old PySide, fallback on PyQt
+             raise ImportError
++        from PySide import QtCore, QtGui, QtSvg
+         QT_API = QT_API_PYSIDE
+     except ImportError:
+         try:
+             prepare_pyqt4()
+             import PyQt4
+-            from PyQt4 import QtCore
++            from PyQt4 import QtCore, QtGui, QtSvg
+             if QtCore.PYQT_VERSION_STR < '4.7':
+                 # PyQt 4.6 has issues with null strings returning as None
+                 raise ImportError

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2012-05-14 20:34:50 UTC (rev 21753)
+++ packages/ipython/trunk/debian/patches/series	2012-05-14 20:35:06 UTC (rev 21754)
@@ -5,3 +5,4 @@
 use-system-mathjax-if-available.patch
 parallel-2to3.patch
 shared-static-path.patch
+full-qt-imports.patch