Commit 3ec41b47 authored by Leo P. Singer's avatar Leo P. Singer
Browse files

Rename import

parent 048935e5
Pipeline #120530 passed with stages
in 1 minute and 34 seconds
......@@ -20,8 +20,7 @@ import logging
import uuid
import pkg_resources
from safe_netrc import netrc as _netrc
from safe_netrc import NetrcParseError
from safe_netrc import netrc, NetrcParseError
import slixmpp
from ._version import get_versions
......@@ -37,7 +36,7 @@ DEFAULT_SERVER = ''
def _get_default_login(netrcfile, server):
netrcfile = _netrc(netrcfile)
netrcfile = netrc(netrcfile)
except (OSError, NetrcParseError):
log.exception('Cannot load netrc file: %s', netrcfile)
return None, None
......@@ -51,8 +50,8 @@ def _get_default_login(netrcfile, server):
return default_username, default_password
def _get_login(username, password, netrc, interactive, server):
default_username, default_password = _get_default_login(netrc, server)
def _get_login(username, password, netrcfile, interactive, server):
default_username, default_password = _get_default_login(netrcfile, server)
prompt = 'password for {}@{}: '.format(username, server)
if username is not None and password is not None:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment