[Python-modules-commits] r25906 - in packages/paste/trunk/debian (changelog patches/types.patch)

[xnox at users.alioth.debian.org]

    Date: Thursday, September 19, 2013 @ 16:29:20
  Author: xnox
Revision: 25906

* Team upload.
* Fix one more python2/3 incompatibility in the lint.py.

Modified:
  packages/paste/trunk/debian/changelog
  packages/paste/trunk/debian/patches/types.patch

Modified: packages/paste/trunk/debian/changelog
===================================================================
--- packages/paste/trunk/debian/changelog	2013-09-19 11:02:19 UTC (rev 25905)
+++ packages/paste/trunk/debian/changelog	2013-09-19 16:29:20 UTC (rev 25906)
@@ -1,3 +1,10 @@
+paste (1.7.5.1-6) unstable; urgency=low
+
+  * Team upload.
+  * Fix one more python2/3 incompatibility in the lint.py.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Thu, 19 Sep 2013 17:19:33 +0100
+
 paste (1.7.5.1-5) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/paste/trunk/debian/patches/types.patch
===================================================================
--- packages/paste/trunk/debian/patches/types.patch	2013-09-19 11:02:19 UTC (rev 25905)
+++ packages/paste/trunk/debian/patches/types.patch	2013-09-19 16:29:20 UTC (rev 25906)
@@ -31,7 +31,16 @@
          "wsgi.version should be a tuple (%r)" % environ['wsgi.version'])
      assert environ['wsgi.url_scheme'] in ('http', 'https'), (
          "wsgi.url_scheme unknown: %r" % environ['wsgi.url_scheme'])
-@@ -374,7 +373,7 @@
+@@ -359,7 +358,7 @@
+             % (wsgi_errors, attr))
+ 
+ def check_status(status):
+-    assert type(status) is StringType, (
++    assert isinstance(status, str), (
+         "Status must be a string (not %r)" % status)
+     # Implicitly check that we can turn it into an integer:
+     status_code = status.split(None, 1)[0]
+@@ -374,12 +373,12 @@
              % status, WSGIWarning)
  
  def check_headers(headers):
@@ -40,3 +49,9 @@
          "Headers (%r) must be of type list: %r"
          % (headers, type(headers)))
      header_names = {}
+     for item in headers:
+-        assert type(item) is TupleType, (
++        assert isinstance(item, tuple), (
+             "Individual headers (%r) must be of type tuple: %r"
+             % (item, type(item)))
+         assert len(item) == 2