[Python-modules-commits] r20325 - in packages/requests/trunk/debian (3 files)

[eriol-guest at users.alioth.debian.org]

    Date: Sunday, February 5, 2012 @ 03:56:00
  Author: eriol-guest
Revision: 20325

* debian/patches/02_fix-python3-except-sintax-error.patches
  - Fix SyntaxError on Python3 because "except Error, e" is not supported
    anymore

Added:
  packages/requests/trunk/debian/patches/02_fix-python3-except-sintax-error.patch
Modified:
  packages/requests/trunk/debian/changelog
  packages/requests/trunk/debian/patches/series

Modified: packages/requests/trunk/debian/changelog
===================================================================
--- packages/requests/trunk/debian/changelog	2012-02-05 02:20:16 UTC (rev 20324)
+++ packages/requests/trunk/debian/changelog	2012-02-05 03:56:00 UTC (rev 20325)
@@ -11,8 +11,11 @@
   * debian/patches/01_do-not-use-python-certifi.patch
     - To verify SSL certificates for HTTPS requests, use the bundle provided by
       ca-certificates instead of python-certifi
+  * debian/patches/02_fix-python3-except-sintax-error.patches
+    - Fix SyntaxError on Python3 because "except Error, e" is not supported
+      anymore
 
- -- Daniele Tricoli <eriol at mornie.org>  Sun, 05 Feb 2012 02:56:07 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Sun, 05 Feb 2012 04:51:38 +0100
 
 requests (0.8.2-1) unstable; urgency=low
 

Added: packages/requests/trunk/debian/patches/02_fix-python3-except-sintax-error.patch
===================================================================
--- packages/requests/trunk/debian/patches/02_fix-python3-except-sintax-error.patch	                        (rev 0)
+++ packages/requests/trunk/debian/patches/02_fix-python3-except-sintax-error.patch	2012-02-05 03:56:00 UTC (rev 20325)
@@ -0,0 +1,35 @@
+Description: Fix SyntaxError on Python3 because "except Error, e" is not
+ supported anymore.
+Author: Daniele Tricoli <eriol at mornie.org>
+Forwarded: https://github.com/kennethreitz/requests/pull/410
+Last-Update: 2012-02-05
+
+--- a/requests/packages/oreos/structures.py
++++ b/requests/packages/oreos/structures.py
+@@ -362,7 +362,7 @@
+         """
+         try:
+             return dict.pop(self, key)[0]
+-        except KeyError, e:
++        except KeyError as e:
+             if default is not _missing:
+                 return default
+             raise KeyError(str(e))
+@@ -372,7 +372,7 @@
+         try:
+             item = dict.popitem(self)
+             return (item[0], item[1][0])
+-        except KeyError, e:
++        except KeyError as e:
+             raise KeyError(str(e))
+ 
+     def poplist(self, key):
+@@ -389,7 +389,7 @@
+         """Pop a ``(key, list)`` tuple from the dict."""
+         try:
+             return dict.popitem(self)
+-        except KeyError, e:
++        except KeyError as e:
+             raise KeyError(str(e))
+ 
+     def __copy__(self):

Modified: packages/requests/trunk/debian/patches/series
===================================================================
--- packages/requests/trunk/debian/patches/series	2012-02-05 02:20:16 UTC (rev 20324)
+++ packages/requests/trunk/debian/patches/series	2012-02-05 03:56:00 UTC (rev 20325)
@@ -1 +1,2 @@
 01_do-not-use-python-certifi.patch
+02_fix-python3-except-sintax-error.patch