[Python-modules-commits] r33867 - in packages/python-tornado/trunk/debian (4 files)

[barry at users.alioth.debian.org]

    Date: Tuesday, August 18, 2015 @ 20:02:37
  Author: barry
Revision: 33867

* New upstream release.
* debian/patches/python35-compat.patch: Python 3.5 compatibility fixes
  pulled from upstream.
* debian/tests/control: Remove an obsolete comment.

Added:
  packages/python-tornado/trunk/debian/patches/python35-compat.patch
Modified:
  packages/python-tornado/trunk/debian/changelog
  packages/python-tornado/trunk/debian/patches/series
  packages/python-tornado/trunk/debian/tests/control

Modified: packages/python-tornado/trunk/debian/changelog
===================================================================
--- packages/python-tornado/trunk/debian/changelog	2015-08-18 18:06:36 UTC (rev 33866)
+++ packages/python-tornado/trunk/debian/changelog	2015-08-18 20:02:37 UTC (rev 33867)
@@ -1,3 +1,12 @@
+python-tornado (4.2.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * debian/patches/python35-compat.patch: Python 3.5 compatibility fixes
+    pulled from upstream.
+  * debian/tests/control: Remove an obsolete comment.
+
+ -- Barry Warsaw <barry at debian.org>  Tue, 18 Aug 2015 13:47:48 -0400
+
 python-tornado (4.2.0-1) unstable; urgency=medium
 
   * Update to latest upstream (Closes: #779035)

Added: packages/python-tornado/trunk/debian/patches/python35-compat.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/python35-compat.patch	                        (rev 0)
+++ packages/python-tornado/trunk/debian/patches/python35-compat.patch	2015-08-18 20:02:37 UTC (rev 33867)
@@ -0,0 +1,45 @@
+Description: Various Python 3.5 compatibility patches pulled from upstream.
+Origin: https://github.com/tornadoweb/tornado
+Forwarded: not-needed
+
+--- a/tornado/util.py
++++ b/tornado/util.py
+@@ -24,6 +24,13 @@
+ except NameError:
+     xrange = range  # py3
+ 
++# inspect.getargspec() raises DeprecationWarnings in Python 3.5.
++# The two functions have compatible interfaces for the parts we need.
++try:
++    from inspect import getfullargspec as getargspec  # py3
++except ImportError:
++    from inspect import getargspec  # py2
++
+ 
+ class ObjectDict(dict):
+     """Makes a dictionary behave like an object, with attribute-style access.
+@@ -284,7 +291,7 @@
+     def __init__(self, func, name):
+         self.name = name
+         try:
+-            self.arg_pos = inspect.getargspec(func).args.index(self.name)
++            self.arg_pos = getargspec(func).args.index(self.name)
+         except ValueError:
+             # Not a positional parameter
+             self.arg_pos = None
+--- a/tornado/test/web_test.py
++++ b/tornado/test/web_test.py
+@@ -1547,8 +1547,11 @@
+     def test_clear_all_cookies(self):
+         response = self.fetch('/', headers={'Cookie': 'foo=bar; baz=xyzzy'})
+         set_cookies = sorted(response.headers.get_list('Set-Cookie'))
+-        self.assertTrue(set_cookies[0].startswith('baz=;'))
+-        self.assertTrue(set_cookies[1].startswith('foo=;'))
++        # Python 3.5 sends 'baz="";'; older versions use 'baz=;'
++        self.assertTrue(set_cookies[0].startswith('baz=;') or
++                        set_cookies[0].startswith('baz="";'))
++        self.assertTrue(set_cookies[1].startswith('foo=;') or
++                        set_cookies[1].startswith('foo="";'))
+ 
+ 
+ class PermissionError(Exception):

Modified: packages/python-tornado/trunk/debian/patches/series
===================================================================
--- packages/python-tornado/trunk/debian/patches/series	2015-08-18 18:06:36 UTC (rev 33866)
+++ packages/python-tornado/trunk/debian/patches/series	2015-08-18 20:02:37 UTC (rev 33867)
@@ -3,3 +3,4 @@
 skip-timing-tests.patch
 sockopt.patch
 without-certifi.patch
+python35-compat.patch

Modified: packages/python-tornado/trunk/debian/tests/control
===================================================================
--- packages/python-tornado/trunk/debian/tests/control	2015-08-18 18:06:36 UTC (rev 33866)
+++ packages/python-tornado/trunk/debian/tests/control	2015-08-18 20:02:37 UTC (rev 33867)
@@ -1,6 +1,5 @@
 Tests: python2
 Depends: python-tornado, python-all, python-twisted, python-pycurl
 
-#py3curl broken (https://github.com/facebook/tornado/issues/671)
 Tests: python3
 Depends: python3-tornado, python3-all