[Python-modules-commits] r14911 - in packages/pyside-tools/trunk/debian/patches (2 files)

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

    Date: Thursday, November 18, 2010 @ 10:30:34
  Author: odyx-guest
Revision: 14911

Add use_python_elementtree.patch to use python's elementtree and don't use the embedded copy.

Added:
  packages/pyside-tools/trunk/debian/patches/use_python_elementtree.patch
Modified:
  packages/pyside-tools/trunk/debian/patches/series

Modified: packages/pyside-tools/trunk/debian/patches/series
===================================================================
--- packages/pyside-tools/trunk/debian/patches/series	2010-11-18 10:30:27 UTC (rev 14910)
+++ packages/pyside-tools/trunk/debian/patches/series	2010-11-18 10:30:34 UTC (rev 14911)
@@ -1 +1,2 @@
 fix_tests.patch
+use_python_elementtree.patch

Added: packages/pyside-tools/trunk/debian/patches/use_python_elementtree.patch
===================================================================
--- packages/pyside-tools/trunk/debian/patches/use_python_elementtree.patch	                        (rev 0)
+++ packages/pyside-tools/trunk/debian/patches/use_python_elementtree.patch	2010-11-18 10:30:34 UTC (rev 14911)
@@ -0,0 +1,38 @@
+Description: Don't install nor use the embedded elementtree copy: python >=2.5
+ ships both cElementTree and ElementTree; use them.
+Origin: vendor
+Author: Didier Raboud <didier at raboud.com>
+Last-Update: 2010-11-18
+Index: pyside-tools.git/CMakeLists.txt
+===================================================================
+--- pyside-tools.git.orig/CMakeLists.txt	2010-11-18 10:54:12.000000000 +0100
++++ pyside-tools.git/CMakeLists.txt	2010-11-18 11:10:55.000000000 +0100
+@@ -34,7 +34,8 @@
+ 
+ 
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pysideuic
+-        DESTINATION ${SITE_PACKAGE})
++        DESTINATION ${SITE_PACKAGE}
++        PATTERN elementtree* EXCLUDE)
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
+                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+Index: pyside-tools.git/pysideuic/uiparser.py
+===================================================================
+--- pyside-tools.git.orig/pysideuic/uiparser.py	2010-11-18 10:50:23.000000000 +0100
++++ pyside-tools.git/pysideuic/uiparser.py	2010-11-18 11:05:52.000000000 +0100
+@@ -29,13 +29,7 @@
+ try:
+     from xml.etree.cElementTree import parse, SubElement
+ except ImportError:
+-    try:
+-        from cElementTree import parse, SubElement
+-    except ImportError:
+-        try:
+-            from elementtree.ElementTree import parse, SubElement
+-        except ImportError:
+-            from pysideuic.elementtree.ElementTree import parse, SubElement
++    from xml.etree.ElementTree import parse, SubElement
+ 
+ 
+ from exceptions import NoSuchWidgetError