netrc will now raise a more predictable exception when $HOME is not set
(as it is often not on Windows). The code was always designed so that it would raise an IOError if there was no .netrc. But if there was no $HOME it would return a KeyError which would be somewhat unexpected for code that didn't know the algorithm it used to find .netrc. The particular code that triggered this problem for me was ftpmirror.py which handled the IOError gracefully, but not the KeyError.
This commit is contained in:
parent
10acc8f9e2
commit
b845f3b4dd
|
@ -22,7 +22,10 @@ class NetrcParseError(Exception):
|
|||
class netrc:
|
||||
def __init__(self, file=None):
|
||||
if not file:
|
||||
file = os.path.join(os.environ['HOME'], ".netrc")
|
||||
try:
|
||||
file = os.path.join(os.environ['HOME'], ".netrc")
|
||||
except KeyError:
|
||||
raise IOError("Could not find .netrc: $HOME is not set")
|
||||
fp = open(file)
|
||||
self.hosts = {}
|
||||
self.macros = {}
|
||||
|
|
Loading…
Reference in New Issue