[Python-modules-commits] r32878 - in packages/pyqt5/trunk/debian (3 files)

[mitya57 at users.alioth.debian.org]

    Date: Saturday, June 6, 2015 @ 09:11:06
  Author: mitya57
Revision: 32878

Let pyuic sort the import order (closes: #787251, thanks to Reiner
Herrmann for the patch).

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

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2015-06-06 09:05:54 UTC (rev 32877)
+++ packages/pyqt5/trunk/debian/changelog	2015-06-06 09:11:06 UTC (rev 32878)
@@ -2,8 +2,10 @@
 
   * Update and unify descriptions of binary packages.
   * Backport upstream change to add support for Qt 5.4.2.
+  * Let pyuic sort the import order (closes: #787251, thanks to Reiner
+    Herrmann for the patch).
 
- -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 18 Mar 2015 12:40:29 +0300
+ -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 06 Jun 2015 12:10:46 +0300
 
 pyqt5 (5.4.1+dfsg-2) experimental; urgency=medium
 

Modified: packages/pyqt5/trunk/debian/patches/series
===================================================================
--- packages/pyqt5/trunk/debian/patches/series	2015-06-06 09:05:54 UTC (rev 32877)
+++ packages/pyqt5/trunk/debian/patches/series	2015-06-06 09:11:06 UTC (rev 32878)
@@ -1,2 +1,3 @@
 uiparser_setzorder_fix.diff
 qt542.diff
+sort_imports.diff

Added: packages/pyqt5/trunk/debian/patches/sort_imports.diff
===================================================================
--- packages/pyqt5/trunk/debian/patches/sort_imports.diff	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/sort_imports.diff	2015-06-06 09:11:06 UTC (rev 32878)
@@ -0,0 +1,29 @@
+Author: Reiner Herrmann <reiner at reiner-h.de>
+Description: sort imported modules to get reproducible output
+Forwarded: yes, http://www.riverbankcomputing.com/pipermail/pyqt/2015-June/036038.html
+Last-Update: 2015-06-06
+
+--- a/pyuic/uic/Compiler/compiler.py
++++ b/pyuic/uic/Compiler/compiler.py
+@@ -114,7 +114,7 @@
+ 
+         self.factory._cpolicy._writeOutImports()
+ 
+-        for res in self._resources:
++        for res in sorted(self._resources):
+             write_import(res, from_imports)
+ 
+         return {"widgetname": str(w),
+--- a/pyuic/uic/Compiler/qobjectcreator.py
++++ b/pyuic/uic/Compiler/qobjectcreator.py
+@@ -132,8 +132,8 @@
+             _, module = self._widgets[widget]
+             imports.setdefault(module, []).append(widget)
+ 
+-        for module, classes in imports.items():
+-            write_code("from %s import %s" % (module, ", ".join(classes)))
++        for module, classes in sorted(imports.items()):
++            write_code("from %s import %s" % (module, ", ".join(sorted(classes))))
+ 
+ 
+ class CompilerCreatorPolicy(object):