From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 28 Jun 2012 23:00:00 +0000 (-0700)
Subject: chardet2
X-Git-Tag: v0.13.2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a17fdf622403d487504af67708b8e6d973760eb7;p=services%2Fpython-requests.git

chardet2
---

diff --git a/requests/compat.py b/requests/compat.py
index 37063f5..b76bc15 100644
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -85,6 +85,7 @@ if is_py2:
     import cookielib
     from Cookie import Morsel
     from StringIO import StringIO
+    from .packages import chardet
 
     bytes = str
     str = unicode
@@ -98,6 +99,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
 
     str = str
     bytes = bytes
diff --git a/requests/models.py b/requests/models.py
index 47316ea..028e8b9 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -32,15 +32,7 @@ from .utils import (
     DEFAULT_CA_BUNDLE_PATH)
 from .compat import (
     cookielib, urlparse, urlunparse, urljoin, urlsplit, urlencode, str, bytes,
-    StringIO, is_py2)
-
-# Import chardet if it is available.
-try:
-    import chardet
-    # hush pyflakes
-    chardet
-except ImportError:
-    chardet = None
+    StringIO, is_py2, chardet)
 
 REDIRECT_STATI = (codes.moved, codes.found, codes.other, codes.temporary_moved)
 CONTENT_CHUNK_SIZE = 10 * 1024