[Python-modules-commits] r32001 - in packages/pyqt5/trunk/debian (4 files)

[mitya57 at users.alioth.debian.org]

    Date: Thursday, March 12, 2015 @ 07:51:26
  Author: mitya57
Revision: 32001

Backport some fixes to setZOrder() function from upstream
(uiparser_setzorder_fix.diff).

Added:
  packages/pyqt5/trunk/debian/patches/
  packages/pyqt5/trunk/debian/patches/series
  packages/pyqt5/trunk/debian/patches/uiparser_setzorder_fix.diff
Modified:
  packages/pyqt5/trunk/debian/changelog

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2015-03-11 16:23:45 UTC (rev 32000)
+++ packages/pyqt5/trunk/debian/changelog	2015-03-12 07:51:26 UTC (rev 32001)
@@ -1,3 +1,10 @@
+pyqt5 (5.4.1+dfsg-2) UNRELEASED; urgency=medium
+
+  * Backport some fixes to setZOrder() function from upstream
+    (uiparser_setzorder_fix.diff).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 12 Mar 2015 10:49:35 +0300
+
 pyqt5 (5.4.1+dfsg-1) experimental; urgency=medium
 
   * New upstream release.

Added: packages/pyqt5/trunk/debian/patches/series
===================================================================
--- packages/pyqt5/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/series	2015-03-12 07:51:26 UTC (rev 32001)
@@ -0,0 +1 @@
+uiparser_setzorder_fix.diff

Added: packages/pyqt5/trunk/debian/patches/uiparser_setzorder_fix.diff
===================================================================
--- packages/pyqt5/trunk/debian/patches/uiparser_setzorder_fix.diff	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/uiparser_setzorder_fix.diff	2015-03-12 07:51:26 UTC (rev 32001)
@@ -0,0 +1,25 @@
+Description: fix crashes in setZOrder function in pyuic
+Origin: upstream, changesets 28704a096a3a and a0dcd07b7e72
+Last-Update: 2015-03-12
+
+--- a/pyuic/uic/uiparser.py
++++ b/pyuic/uic/uiparser.py
+@@ -754,7 +754,17 @@
+                     self.row_counter += 1
+ 
+     def setZOrder(self, elem):
+-        getattr(self.toplevelWidget, elem.text).raise_()
++        # Designer can generate empty zorder elements.
++        if elem.text is None:
++            return
++
++        # Designer allows the z-order of spacer items to be specified even
++        # though they can't be raised, so ignore any missing raise_() method.
++        try:
++            getattr(self.toplevelWidget, elem.text).raise_()
++        except AttributeError:
++            # Note that uic issues a warning message.
++            pass
+ 
+     def createAction(self, elem):
+         self.setupObject("QAction", self.currentActionGroup or self.toplevelWidget,