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 /requests/compat.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 'requests/compat.py')
| -rw-r--r-- | requests/compat.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/requests/compat.py b/requests/compat.py index 0d61a572..bdf10d6a 100644 --- a/requests/compat.py +++ b/requests/compat.py @@ -4,7 +4,7 @@ pythoncompat """ -from .packages import charade as chardet +from .packages import chardet import sys |