From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 29 Nov 2012 16:30:07 +0000 (-0800)
Subject: charade
X-Git-Tag: v1.0.0~91
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ead850065189a094687894168abcf99cabe7f02;p=services%2Fpython-requests.git

charade
---

diff --git a/Makefile b/Makefile
index 1473d12..5d403bd 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ site:
 clean:
 	git clean -Xfd
 
-deps: urllib3 certs
+deps: urllib3 certs charade
 
 urllib3:
 	rm -fr requests/packages/urllib3
@@ -67,12 +67,12 @@ urllib3:
 	mv urllib3/urllib3 requests/packages/
 	rm -fr urllib3
 
-oauthlib:
-	rm -fr requests/packages/oauthlib
-	git clone https://github.com/idan/oauthlib.git
-	cd oauthlib && git checkout master && cd ..
-	mv oauthlib/oauthlib requests/packages/
-	rm -fr oauthlib
+charade:
+	rm -fr requests/packages/charade
+	git clone https://github.com/sigmavirus24/charade.git
+	cd charade && git checkout master && cd ..
+	mv charade/charade requests/packages/
+	rm -fr charade
 
 certs:
 	cd requests && curl -O https://raw.github.com/kennethreitz/certifi/master/certifi/cacert.pem
diff --git a/setup.py b/setup.py
index d8096b0..9b63551 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.charade'
     'requests.packages.urllib3',
     'requests.packages.urllib3.packages',
     'requests.packages.urllib3.packages.ssl_match_hostname'