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

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

    Date: Friday, March 16, 2012 @ 16:40:25
  Author: eriol-guest
Revision: 20804

Removed 02_fix-python3-except-sintax-error.patch as it is applied upstream

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

Modified: packages/requests/trunk/debian/changelog
===================================================================
--- packages/requests/trunk/debian/changelog	2012-03-16 12:34:02 UTC (rev 20803)
+++ packages/requests/trunk/debian/changelog	2012-03-16 16:40:25 UTC (rev 20804)
@@ -5,8 +5,10 @@
 
   [ Daniele Tricoli ]
   * New upstream release (Closes: #663561)
+  * debian/patches/02_fix-python3-except-sintax-error.patch
+    - Removed as it is applied upstream
 
- -- Daniele Tricoli <eriol at mornie.org>  Tue, 13 Mar 2012 08:13:06 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Fri, 16 Mar 2012 17:37:39 +0100
 
 requests (0.10.1-1) unstable; urgency=low
 

Deleted: packages/requests/trunk/debian/patches/02_fix-python3-except-sintax-error.patch
===================================================================
--- packages/requests/trunk/debian/patches/02_fix-python3-except-sintax-error.patch	2012-03-16 12:34:02 UTC (rev 20803)
+++ packages/requests/trunk/debian/patches/02_fix-python3-except-sintax-error.patch	2012-03-16 16:40:25 UTC (rev 20804)
@@ -1,35 +0,0 @@
-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-03-16 12:34:02 UTC (rev 20803)
+++ packages/requests/trunk/debian/patches/series	2012-03-16 16:40:25 UTC (rev 20804)
@@ -1,2 +1 @@
 01_do-not-use-python-certifi.patch
-02_fix-python3-except-sintax-error.patch