From fd6b1f0c4e7fc4c7236faf5c0debff8222c08af2 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Tue, 27 Nov 2012 22:14:09 -0500 Subject: [PATCH 1/2] Fix #972 Someone forgot a comma --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d8096b0d..4f6ca91c 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ if sys.argv[-1] == 'publish': packages = [ 'requests', 'requests.packages', - 'requests.packages.chardet' + 'requests.packages.chardet', 'requests.packages.urllib3', 'requests.packages.urllib3.packages', 'requests.packages.urllib3.packages.ssl_match_hostname' From b69854e96e0486be287431896a6ae61f36150661 Mon Sep 17 00:00:00 2001 From: Keiji Matsuzaki Date: Thu, 29 Nov 2012 01:29:13 +0900 Subject: [PATCH 2/2] Modified: Change the import statement. --- requests/compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/compat.py b/requests/compat.py index aa62406e..637b2dd5 100644 --- a/requests/compat.py +++ b/requests/compat.py @@ -109,7 +109,7 @@ elif is_py3: from http import cookiejar as cookielib from http.cookies import Morsel from io import StringIO - from .packages import chardet2 as chardet + from .packages import chardet from collections import OrderedDict builtin_str = str