aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2012-03-16 16:40:25 +0000
committerDaniele Tricoli <eriol@mornie.org>2012-03-16 16:40:25 +0000
commit04560d7f5ca66b98a9f76c57a041b053c4327648 (patch)
tree53684e771e941d4f757dbd1a4061217dbae81eaa /debian/patches
parentf57955b28d7a9f10e40ec43bfa04a97d2eeb1c85 (diff)
downloadpython-requests-04560d7f5ca66b98a9f76c57a041b053c4327648.tar
python-requests-04560d7f5ca66b98a9f76c57a041b053c4327648.tar.gz
Removed 02_fix-python3-except-sintax-error.patch as it is applied upstream
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/02_fix-python3-except-sintax-error.patch35
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 36 deletions
diff --git a/debian/patches/02_fix-python3-except-sintax-error.patch b/debian/patches/02_fix-python3-except-sintax-error.patch
deleted file mode 100644
index 8e0eb52..0000000
--- a/debian/patches/02_fix-python3-except-sintax-error.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Fix SyntaxError on Python3 because "except Error, e" is not
- supported anymore.
-Author: Daniele Tricoli <eriol@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):
diff --git a/debian/patches/series b/debian/patches/series
index 38c3ed3..94aff1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_do-not-use-python-certifi.patch
-02_fix-python3-except-sintax-error.patch