From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 27 Nov 2012 20:52:17 +0000 (-0800)
Subject: fix chardet import
X-Git-Tag: v1.0.0~94
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0af19a05ce54bbb9e306771710e6eac15506d4c3;p=services%2Fpython-requests.git

fix chardet import
---

diff --git a/requests/compat.py b/requests/compat.py
index aa62406..04cd0e9 100644
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -81,6 +81,11 @@ except ImportError:
 # Specifics
 # ---------
 
+try:
+    import cchardet as chardet
+except ImportError:
+    from .packages import chardet
+
 
 if is_py2:
     from urllib import quote, unquote, quote_plus, unquote_plus, urlencode
@@ -89,10 +94,6 @@ if is_py2:
     import cookielib
     from Cookie import Morsel
     from StringIO import StringIO
-    try:
-        import cchardet as chardet
-    except ImportError:
-        from .packages import chardet
     from .packages.urllib3.packages.ordered_dict import OrderedDict
 
     builtin_str = str
@@ -109,7 +110,6 @@ 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 collections import OrderedDict
 
     builtin_str = str
diff --git a/requests/packages/chardet/test.py b/requests/packages/chardet/test.py
index f3a3929..bffce93 100644
--- a/requests/packages/chardet/test.py
+++ b/requests/packages/chardet/test.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys, glob
 sys.path.insert(0, '..')
 from chardet.universaldetector import UniversalDetector