[Python-modules-commits] r20898 - in packages/python-wadllib/trunk/debian (6 files)

Thu Mar 22 14:55:05 UTC 2012

Date: Thursday, March 22, 2012 @ 14:55:03
  Author: stefanor
Revision: 20898

Bump Standards-Version to 3.9.3, no changes needed.

Added:
  packages/python-wadllib/trunk/debian/patches/no-et-roundtrip
    (from rev 20897, packages/python-wadllib/trunk/debian/patches/no-et-roundtrip.patch)
Modified:
  packages/python-wadllib/trunk/debian/changelog
  packages/python-wadllib/trunk/debian/control
  packages/python-wadllib/trunk/debian/copyright
  packages/python-wadllib/trunk/debian/patches/series
Deleted:
  packages/python-wadllib/trunk/debian/patches/no-et-roundtrip.patch

Modified: packages/python-wadllib/trunk/debian/changelog
===================================================================

--- packages/python-wadllib/trunk/debian/changelog	2012-03-21 19:06:03 UTC (rev 20897)
+++ packages/python-wadllib/trunk/debian/changelog	2012-03-22 14:55:03 UTC (rev 20898)
@@ -1,11 +1,12 @@
-python-wadllib (1.3.0-2) UNRELEASED; urgency=low
+python-wadllib (1.3.0-2) unstable; urgency=low
 
   * Rebuild against python3-defaults 3.2.3~rc1-2, to generate correct
     ${python3:Depends}.
-  * no-et-roundtrip.patch: Avoid round-trip through ET that loses namespaces.
+  * Patch no-et-roundtrip: Avoid round-trip through ET that loses namespaces.
     (LP: #924240)
+  * Bump Standards-Version to 3.9.3, no changes needed.
 
- -- Stefano Rivera <stefanor at debian.org>  Mon, 19 Mar 2012 15:48:47 +0200
+ -- Stefano Rivera <stefanor at debian.org>  Thu, 22 Mar 2012 16:48:48 +0200
 
 python-wadllib (1.3.0-1) unstable; urgency=low
 

Modified: packages/python-wadllib/trunk/debian/control
===================================================================
--- packages/python-wadllib/trunk/debian/control	2012-03-21 19:06:03 UTC (rev 20897)
+++ packages/python-wadllib/trunk/debian/control	2012-03-22 14:55:03 UTC (rev 20898)
@@ -12,7 +12,7 @@
  python3-all (>= 3.1.2-6~),
  python3-lazr.uri,
  python3-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: https://launchpad.net/wadllib
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-wadllib/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-wadllib/trunk/

Modified: packages/python-wadllib/trunk/debian/copyright
===================================================================
--- packages/python-wadllib/trunk/debian/copyright	2012-03-21 19:06:03 UTC (rev 20897)
+++ packages/python-wadllib/trunk/debian/copyright	2012-03-22 14:55:03 UTC (rev 20898)
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: wadllib
 Source: https://launchpad.net/wadllib
 

Copied: packages/python-wadllib/trunk/debian/patches/no-et-roundtrip (from rev 20897, packages/python-wadllib/trunk/debian/patches/no-et-roundtrip.patch)
===================================================================
--- packages/python-wadllib/trunk/debian/patches/no-et-roundtrip	                        (rev 0)
+++ packages/python-wadllib/trunk/debian/patches/no-et-roundtrip	2012-03-22 14:55:03 UTC (rev 20898)
@@ -0,0 +1,25 @@
+Description: Don't roundtrip through ET, losing namespaces
+ Roundtripping through ET was losing the namespace information, causing
+ datetimes to be returned as strings.
+Forwarded: https://code.launchpad.net/~stefanor/wadllib/datetime-924240/+merge/97099
+Author: Stefano Rivera <stefanor at debian.org>
+Last-Update: 2012-03-22
+
+--- a/src/wadllib/application.py
++++ b/src/wadllib/application.py
+@@ -1104,13 +1104,8 @@
+         return ET.ElementTree(root)
+ 
+     def _from_string(self, markup):
+-        """Turns markup into a document.
+-
+-        Just a wrapper around ElementTree which keeps track of namespaces.
+-        """
+-        # We're using the ET fromstring/tostring to help make sure we maintain
+-        # py2/3 compatiblity and keeping things in Unicode.
+-        return self._from_stream(BytesIO(ET.tostring(ET.fromstring(markup))))
++        """Turns markup into a document."""
++        return self._from_stream(BytesIO(markup))
+ 
+     def get_resource_type(self, resource_type_url):
+         """Retrieve a resource type by the URL of its description."""

Deleted: packages/python-wadllib/trunk/debian/patches/no-et-roundtrip.patch
===================================================================
--- packages/python-wadllib/trunk/debian/patches/no-et-roundtrip.patch	2012-03-21 19:06:03 UTC (rev 20897)
+++ packages/python-wadllib/trunk/debian/patches/no-et-roundtrip.patch	2012-03-22 14:55:03 UTC (rev 20898)
@@ -1,30 +0,0 @@
-Description: Don't roundtrip through ET, losing namespaces
- I don't understand the purpose of the round tripping through ET in
- _from_string. More to the point, it claims to track namespaces, but clearly
- doesn't correctly, causing LP: #924240.
- .
- My not understanding, is entirely possibly due to me not knowing this code at
- all, but the change fixes the issue for me, and the tests still pass under
- python 2 & 3.
-Forwarded: https://code.launchpad.net/~stefanor/wadllib/datetime-924240/+merge/97099
-Author: Stefano Rivera <stefanor at debian.org>
-Last-Update: 2012-03-19
-
---- a/src/wadllib/application.py
-+++ b/src/wadllib/application.py
-@@ -1104,13 +1104,8 @@
-         return ET.ElementTree(root)
- 
-     def _from_string(self, markup):
--        """Turns markup into a document.
--
--        Just a wrapper around ElementTree which keeps track of namespaces.
--        """
--        # We're using the ET fromstring/tostring to help make sure we maintain
--        # py2/3 compatiblity and keeping things in Unicode.
--        return self._from_stream(BytesIO(ET.tostring(ET.fromstring(markup))))
-+        """Turns markup into a document."""
-+        return self._from_stream(BytesIO(markup))
- 
-     def get_resource_type(self, resource_type_url):
-         """Retrieve a resource type by the URL of its description."""

Modified: packages/python-wadllib/trunk/debian/patches/series
===================================================================
--- packages/python-wadllib/trunk/debian/patches/series	2012-03-21 19:06:03 UTC (rev 20897)
+++ packages/python-wadllib/trunk/debian/patches/series	2012-03-22 14:55:03 UTC (rev 20898)
@@ -1,2 +1,2 @@
 install-data
-no-et-roundtrip.patch
+no-et-roundtrip


