diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2014-01-08 13:53:23 -0500 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2014-01-08 13:53:23 -0500 |
| commit | df1c2335c82165b961b8a0361d0176cdb298e513 (patch) | |
| tree | 7fcf397321be4a85ad4a757751568a4082b02305 /setup.py | |
| parent | 1500632b602be698bfce682daeb01a2d64fc2d39 (diff) | |
| parent | b17cad65cf27646f0680954914ab31abd4f626c9 (diff) | |
| download | python-requests-fix-pickling-adapters.tar.gz | |
Merge branch 'master' into fix-pickling-adaptersfix-pickling-adapters
Conflicts:
AUTHORS.rst
Diffstat (limited to 'setup.py')
| -rwxr-xr-x | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -17,7 +17,7 @@ if sys.argv[-1] == 'publish': packages = [ 'requests', 'requests.packages', - 'requests.packages.charade', + 'requests.packages.chardet', 'requests.packages.urllib3', 'requests.packages.urllib3.packages', 'requests.packages.urllib3.contrib', |