diff options
Diffstat (limited to 'requests/utils.py')
| -rw-r--r-- | requests/utils.py | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/requests/utils.py b/requests/utils.py index f5f6b95..a2d434e 100644 --- a/requests/utils.py +++ b/requests/utils.py @@ -28,10 +28,9 @@ _hush_pyflakes = (RequestsCookieJar,) NETRC_FILES = ('.netrc', '_netrc') -# if certifi is installed, use its CA bundle; -# otherwise, try and use the OS bundle DEFAULT_CA_BUNDLE_PATH = certs.where() + def dict_to_sequence(d): """Returns an internal sequence dictionary update.""" @@ -40,6 +39,7 @@ def dict_to_sequence(d): return d + def super_len(o): if hasattr(o, '__len__'): return len(o) @@ -48,6 +48,7 @@ def super_len(o): if hasattr(o, 'fileno'): return os.fstat(o.fileno()).st_size + def get_netrc_auth(url): """Returns the Requests tuple auth for a given url from netrc.""" @@ -88,7 +89,7 @@ def guess_filename(obj): """Tries to guess the filename of the given object.""" name = getattr(obj, 'name', None) if name and name[0] != '<' and name[-1] != '>': - return name + return os.path.basename(name) def from_key_val_list(value): @@ -251,8 +252,7 @@ def add_dict_to_cookiejar(cj, cookie_dict): """ cj2 = cookiejar_from_dict(cookie_dict) - for cookie in cj2: - cj.set_cookie(cookie) + cj.update(cj2) return cj @@ -466,11 +466,9 @@ def default_user_agent(): if _implementation == 'CPython': _implementation_version = platform.python_version() elif _implementation == 'PyPy': - _implementation_version = '%s.%s.%s' % ( - sys.pypy_version_info.major, + _implementation_version = '%s.%s.%s' % (sys.pypy_version_info.major, sys.pypy_version_info.minor, - sys.pypy_version_info.micro - ) + sys.pypy_version_info.micro) if sys.pypy_version_info.releaselevel != 'final': _implementation_version = ''.join([_implementation_version, sys.pypy_version_info.releaselevel]) elif _implementation == 'Jython': @@ -487,11 +485,10 @@ def default_user_agent(): p_system = 'Unknown' p_release = 'Unknown' - return " ".join([ - 'python-requests/%s' % __version__, - '%s/%s' % (_implementation, _implementation_version), - '%s/%s' % (p_system, p_release), - ]) + return " ".join(['python-requests/%s' % __version__, + '%s/%s' % (_implementation, _implementation_version), + '%s/%s' % (p_system, p_release)]) + def default_headers(): return { @@ -524,7 +521,7 @@ def parse_header_links(value): for param in params.split(";"): try: - key,value = param.split("=") + key, value = param.split("=") except ValueError: break @@ -582,3 +579,13 @@ def prepend_scheme_if_needed(url, new_scheme): netloc, path = path, netloc return urlunparse((scheme, netloc, path, params, query, fragment)) + + +def get_auth_from_url(url): + """Given a url with authentication components, extract them into a tuple of + username,password.""" + if url: + parsed = urlparse(url) + return (parsed.username, parsed.password) + else: + return ('', '') |