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

[xnox at users.alioth.debian.org]

    Date: Wednesday, February 11, 2015 @ 04:34:10
  Author: xnox
Revision: 31839

* Return binary MIME representation, rather than string. (LP: #1414063)
* Bump python3 compat to 3.4.
* Bump standards version to 3.9.6.

Added:
  packages/python-wadllib/trunk/debian/patches/bytes-test.patch
  packages/python-wadllib/trunk/debian/patches/bytes.patch
Modified:
  packages/python-wadllib/trunk/debian/changelog
  packages/python-wadllib/trunk/debian/control
  packages/python-wadllib/trunk/debian/patches/series

Modified: packages/python-wadllib/trunk/debian/changelog
===================================================================
--- packages/python-wadllib/trunk/debian/changelog	2015-02-10 13:27:58 UTC (rev 31838)
+++ packages/python-wadllib/trunk/debian/changelog	2015-02-11 04:34:10 UTC (rev 31839)
@@ -1,3 +1,11 @@
+python-wadllib (1.3.2-3) UNRELEASED; urgency=medium
+
+  * Return binary MIME representation, rather than string. (LP: #1414063)
+  * Bump python3 compat to 3.4.
+  * Bump standards version to 3.9.6.
+
+ -- Dimitri John Ledkov <dimitri.j.ledkov at linux.intel.com>  Wed, 11 Feb 2015 04:05:12 +0000
+
 python-wadllib (1.3.2-2) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/python-wadllib/trunk/debian/control
===================================================================
--- packages/python-wadllib/trunk/debian/control	2015-02-10 13:27:58 UTC (rev 31838)
+++ packages/python-wadllib/trunk/debian/control	2015-02-11 04:34:10 UTC (rev 31839)
@@ -12,12 +12,12 @@
  python3-all (>= 3.1.2-6~),
  python3-lazr.uri,
  python3-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: https://launchpad.net/wadllib
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-wadllib/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-wadllib/trunk/
 X-Python-Version: >= 2.4
-X-Python3-Version: >= 3.2
+X-Python3-Version: >= 3.4
 
 Package: python-wadllib
 Architecture: all

Added: packages/python-wadllib/trunk/debian/patches/bytes-test.patch
===================================================================
--- packages/python-wadllib/trunk/debian/patches/bytes-test.patch	                        (rev 0)
+++ packages/python-wadllib/trunk/debian/patches/bytes-test.patch	2015-02-11 04:34:10 UTC (rev 31839)
@@ -0,0 +1,36 @@
+Description: Update doctests to be pyhon2 & python3 friendly.
+Origin: commit, revision id: dimitri.j.ledkov at intel.com-20150211041908-7greonadajj0omw8
+Author: Dimitri John Ledkov <dimitri.j.ledkov at intel.com>
+Last-Update: 2015-02-11
+X-Bzr-Revision-Id: dimitri.j.ledkov at intel.com-20150211041908-7greonadajj0omw8
+
+=== modified file 'src/wadllib/README.txt'
+--- old/src/wadllib/README.txt	2013-02-25 18:53:09 +0000
++++ new/src/wadllib/README.txt	2015-02-11 04:19:08 +0000
+@@ -573,24 +573,7 @@
+    ...     text_field="text", binary_field="\x01\x02")
+    >>> print(media_type)
+    multipart/form-data; boundary=...
+-   >>> print(doc)
+-   MIME-Version: 1.0
+-   Content-Type: multipart/form-data; boundary="..."
+-   <BLANKLINE>
+-   --...
+-   Content-Type: text/plain; charset="utf-8"
+-   MIME-Version: 1.0
+-   Content-Disposition: form-data; name="text_field"
+-   <BLANKLINE>
+-   text
+-   --...
+-   Content-Type: application/octet-stream
+-   MIME-Version: 1.0
+-   Content-Disposition: form-data; name="binary_field"
+-   <BLANKLINE>
+-   ...
+-   --...
+-   >>> '\x01\x02' in doc
++   >>> b'\x01\x02' in doc
+    True
+ 
+    >>> method = service_root.get_method('post', 'text/unknown')
+

Added: packages/python-wadllib/trunk/debian/patches/bytes.patch
===================================================================
--- packages/python-wadllib/trunk/debian/patches/bytes.patch	                        (rev 0)
+++ packages/python-wadllib/trunk/debian/patches/bytes.patch	2015-02-11 04:34:10 UTC (rev 31839)
@@ -0,0 +1,27 @@
+Description: MIME document needs to be bytes in python3
+Origin: commit, revision id: dimitri.j.ledkov at intel.com-20150211040157-2hyi9olcaaoc3x5p
+Author: Dimitri John Ledkov <dimitri.j.ledkov at intel.com>
+Bug: https://launchpad.net/bugs/1414063
+Last-Update: 2015-02-11
+X-Bzr-Revision-Id: dimitri.j.ledkov at intel.com-20150211040157-2hyi9olcaaoc3x5p
+
+=== modified file 'src/wadllib/application.py'
+--- old/src/wadllib/application.py	2013-02-25 18:53:09 +0000
++++ new/src/wadllib/application.py	2015-02-11 03:56:31 +0000
+@@ -853,11 +853,10 @@
+                     inner['Content-Disposition'] = (
+                         'form-data; name="%s"' % param.name)
+                     outer.attach(inner)
+-            doc = str(outer)
+-            # Chop off the 'From' line, which only makes sense in an
+-            # email.  (Python 3 does not include it.)
+-            if doc.startswith('From '):
+-                doc = doc[doc.find('\n')+1:]
++            if hasattr(outer, "as_bytes"):
++                doc = outer.as_bytes()
++            else:
++                doc = outer.as_string(unixfrom=False)
+             media_type = (outer.get_content_type() +
+                           '; boundary="%s"' % outer.get_boundary())
+         elif media_type == 'application/json':
+

Modified: packages/python-wadllib/trunk/debian/patches/series
===================================================================
--- packages/python-wadllib/trunk/debian/patches/series	2015-02-10 13:27:58 UTC (rev 31838)
+++ packages/python-wadllib/trunk/debian/patches/series	2015-02-11 04:34:10 UTC (rev 31839)
@@ -1 +1,3 @@
 install-data
+bytes.patch
+bytes-test.patch