From b845f3b4dd2074b22eb2915ba4514bd2d5a87769 Mon Sep 17 00:00:00 2001 From: Paul Prescod Date: Mon, 18 Mar 2002 02:13:48 +0000 Subject: 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. --- Lib/netrc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/netrc.py b/Lib/netrc.py index 3f1c7c3..b78d4d8 100644 --- a/Lib/netrc.py +++ b/Lib/netrc.py @@ -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 = {} -- cgit v0.12