diff options
| author | Donald Stufft <donald@stufft.io> | 2014-05-16 22:21:32 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-05-16 22:21:32 -0400 |
| commit | 81f21f2261d422d243f66b2dfeef0faae72ab119 (patch) | |
| tree | 564425afe21fd919eadebce74fb8e35ba765392e /pip/_vendor/requests/packages/urllib3/fields.py | |
| parent | 6c71953b543cd15e611b2cc05178902e0e4afe42 (diff) | |
| parent | 52ffb9f9ea88596e7a7953eaf04eaed681bf19cf (diff) | |
| download | pip-81f21f2261d422d243f66b2dfeef0faae72ab119.tar.gz | |
Merge branch '1.5.X'1.5.6
Conflicts:
CHANGES.txt
Diffstat (limited to 'pip/_vendor/requests/packages/urllib3/fields.py')
| -rw-r--r-- | pip/_vendor/requests/packages/urllib3/fields.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pip/_vendor/requests/packages/urllib3/fields.py b/pip/_vendor/requests/packages/urllib3/fields.py index ed017657a..da79e929b 100644 --- a/pip/_vendor/requests/packages/urllib3/fields.py +++ b/pip/_vendor/requests/packages/urllib3/fields.py @@ -15,7 +15,7 @@ def guess_content_type(filename, default='application/octet-stream'): Guess the "Content-Type" of a file. :param filename: - The filename to guess the "Content-Type" of using :mod:`mimetimes`. + The filename to guess the "Content-Type" of using :mod:`mimetypes`. :param default: If no "Content-Type" can be guessed, default to `default`. """ |