requests/utils.py
<<<<<<< SEARCH
    netloc = parsed.netloc
    if not netloc:
        netloc, path = path, netloc

    if scheme is None:
        scheme = new_scheme
    if path is None:
        path = ''

    return urlunparse((scheme, netloc, path, '', query, fragment))
=======
    netloc = parsed.netloc
    if not netloc:
        netloc, path = path, netloc

    if scheme is None:
        scheme = new_scheme
    if path is None:
        path = ''

    if auth:
        netloc = auth + '@' + netloc

    return urlunparse((scheme, netloc, path, '', query, fragment))
>>>>>>> REPLACE