Resolves#6796.

/cc@zooba since this was modified last in the keyring PR, which is what git bisect points to as well.

Potential test case

def test_get_single_credential():    auth = MultiDomainBasicAuth()    get = auth._get_url_and_credentials    assert get("http://token@example.com/path") \        == ('http://example.com/path', 'token', None)    assert auth.passwords['example.com'] == ('token', None)

To place in:

ConvertingNone to"" sounds reasonable to me. Though there may also be issues with the caching if we parse"" out of a URL but are expecting/looking forNone.

I've paged all of this code out of my head already, I'm afraid, so without going through and relearning it I can't really offer much help, sorry :)

Hehe. No worries@zooba! Thanks for chiming in.

I'm hoping I'll be able to make time to look into this today or tomorrow.

@booleand Would you mind if I pick this up from here?

@booleand Would you mind if I pick this up from here?

@pradyunsg OK

Just want to mention a few things:

1. Need to consider which conditional to use on this line as the behavior will be different:

I suspect there may be edge cases which will result in unexpected behavior. In particular when multiple calls are being made to aMultiDomainBasicAuth object.

2. Here is a summary of changes inMultiDomainBasicAuth:

• _get_new_credentials now returns ausername even if itdoesn't locate a password.

• _get_url_and_credentials calls_get_new_credentialsonly when bothusername andpassword are empty. Though this may need to be reconsidered depending on requirements.

• _get_url_and_credentials storesusername and/orpassword wheneither is found.

• __call__ now instantiates and calls aHTTPBasicAuth wheneitherusername orpassword is present. It also converts anyNoneTypes to an empty string.

3. Here is a potential test case forMultiDomainBasicAuth.__call__ :

def test_basic_auth_with_url_embedded_token():    with patch.object(pip._internal.download.HTTPBasicAuth, '__call__') as mock_auth:        auth = MultiDomainBasicAuth()        req = MockRequest("http://token@example.com/path")        auth(req)    assert mock_auth.called_with('token', '')

Thanks@booleand!

consider which conditional to use on this line

I decided to preserve that conditional as is, and modified what_get_url_and_credentials would return. The guard, as it stands, seems to be correct to me.

summary of changes

Thank you -- these helped. :)

potential test case

I ended up augmenting existing tests:0832006.