[Python-modules-commits] r30552 - in packages/pylons/trunk/debian (2 files)

[andrewsh at users.alioth.debian.org]

    Date: Tuesday, September 9, 2014 @ 06:52:12
  Author: andrewsh
Revision: 30552

Replace the WebOb exception patch by a more complete one from Darren Yin.

Modified:
  packages/pylons/trunk/debian/changelog
  packages/pylons/trunk/debian/patches/dont_use_removed_exception_attribute.patch

Modified: packages/pylons/trunk/debian/changelog
===================================================================
--- packages/pylons/trunk/debian/changelog	2014-09-09 06:26:34 UTC (rev 30551)
+++ packages/pylons/trunk/debian/changelog	2014-09-09 06:52:12 UTC (rev 30552)
@@ -1,3 +1,10 @@
+pylons (1.0.1-3) UNRELEASED; urgency=medium
+
+  * Replace the WebOb exception patch by a more complete one from
+    Darren Yin.
+
+ -- Andrew Shadura <andrewsh at debian.org>  Tue, 09 Sep 2014 08:50:22 +0200
+
 pylons (1.0.1-2) unstable; urgency=medium
 
   [ Andrew Shadura ]

Modified: packages/pylons/trunk/debian/patches/dont_use_removed_exception_attribute.patch
===================================================================
--- packages/pylons/trunk/debian/patches/dont_use_removed_exception_attribute.patch	2014-09-09 06:26:34 UTC (rev 30551)
+++ packages/pylons/trunk/debian/patches/dont_use_removed_exception_attribute.patch	2014-09-09 06:52:12 UTC (rev 30552)
@@ -1,10 +1,21 @@
-Author: Uriy Zhuravev <stalkerg at gmail.com>
-Date: Fri, 18 Jul 2014 01:33:09 +0400
+Author: Darren Yin <darren.yin at gmail.com>
+Date: Fri, 20 Aug 2014 01:56:08 -0700
 Description: WebOb 1.4 removed exception attribute; don't use it.
 
+diff --git a/pylons/controllers/util.py b/pylons/controllers/util.py
+index f9e0c4b..1cfd085 100644
 --- a/pylons/controllers/util.py
 +++ b/pylons/controllers/util.py
-@@ -207,7 +207,7 @@
+@@ -174,7 +174,7 @@ def index(self):
+         response.headers.pop('Content-Type', None)
+         response.headers.pop('Cache-Control', None)
+         response.headers.pop('Pragma', None)
+-        raise status_map[304]().exception
++        raise status_map[304]()
+     else:
+         log.debug("ETag didn't match, returning response object")
+ 
+@@ -207,7 +207,7 @@ def abort(status_code=None, detail="", headers=None, comment=None):
                                    comment=comment)
      log.debug("Aborting request, status: %s, detail: %r, headers: %r, "
                "comment: %r", status_code, detail, headers, comment)
@@ -13,9 +24,27 @@
  
  
  def redirect(url, code=302):
-@@ -221,4 +221,4 @@
+@@ -221,4 +221,4 @@ def redirect(url, code=302):
      """
      log.debug("Generating %s redirect" % code)
      exc = status_map[code]
 -    raise exc(location=url).exception
 +    raise exc(location=url)
+diff --git a/tests/test_units/test_controller.py b/tests/test_units/test_controller.py
+index a098aee..bdaf538 100644
+--- a/tests/test_units/test_controller.py
++++ b/tests/test_units/test_controller.py
+@@ -36,11 +36,11 @@ def strme(self):
+     def use_redirect(self):
+         pylons.response.set_cookie('message', 'Hello World')
+         exc = status_map[301]
+-        raise exc('/elsewhere').exception
++        raise exc('/elsewhere')
+     
+     def use_customnotfound(self):
+         exc = status_map[404]
+-        raise exc('Custom not found').exception
++        raise exc('Custom not found')
+     
+     def header_check(self):
+         pylons.response.headers['Content-Type'] = 'text/plain'