From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 29 Nov 2012 16:35:35 +0000 (-0800)
Subject: Merge branch 'master' of github.com:kennethreitz/requests
X-Git-Tag: v1.0.0~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5cb6355edd67e25a4a213a3559f9da4ba8d44fc;p=services%2Fpython-requests.git

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

Conflicts:
	requests/compat.py
	setup.py
---

a5cb6355edd67e25a4a213a3559f9da4ba8d44fc
diff --cc requests/compat.py
index 04cd0e9,637b2dd..67e058b
--- a/requests/compat.py
+++ b/requests/compat.py
@@@ -81,12 -81,7 +81,6 @@@ 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
      from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag
diff --cc setup.py
index 9b63551,4f6ca91..82ee870
--- a/setup.py
+++ b/setup.py
@@@ -17,7 -17,7 +17,7 @@@ if sys.argv[-1] == 'publish'
  packages = [
      'requests',
      'requests.packages',
-     'requests.packages.charade'
 -    'requests.packages.chardet',
++	'requests.packages.charade',
      'requests.packages.urllib3',
      'requests.packages.urllib3.packages',
      'requests.packages.urllib3.packages.ssl_match_hostname'