Merge branch 'master' of github.com:kennethreitz/requests

Conflicts: requests/compat.py setup.py
kennethreitz · Nov 29, 2012 · a5cb635 · a5cb635
2 parents 6ead850 + 8f86ff6
commit a5cb635
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/requests/compat.py b/requests/compat.py
@@ -81,12 +81,6 @@
 # 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
     from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag

diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
 packages = [
     'requests',
     'requests.packages',
-    'requests.packages.charade'
+	'requests.packages.charade',
     'requests.packages.urllib3',
     'requests.packages.urllib3.packages',
     'requests.packages.urllib3.packages.ssl_match_hostname'