From c8af1e53309dec4445ead0b1d829530ec3ec9664 Mon Sep 17 00:00:00 2001 From: calvin Date: Wed, 8 Jan 2003 20:05:53 +0000 Subject: [PATCH] fix debug/warn/error usage git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@735 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- linkcheck/Config.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/linkcheck/Config.py b/linkcheck/Config.py index 129298b4..986223d5 100644 --- a/linkcheck/Config.py +++ b/linkcheck/Config.py @@ -421,15 +421,6 @@ class Configuration (UserDict.UserDict): cfiles.append(norm("~/.linkcheckerrc")) self.readConfig(cfiles) - def warn (self, msg): - self.message(i18n._("Warning: %s")%msg) - - def error (self, msg): - self.message(i18n._("Error: %s")%msg) - - def message (self, msg): - print >> sys.stderr, msg - def readConfig (self, files): """this big function reads all the configuration parameters used in the linkchecker module.""" @@ -458,7 +449,7 @@ class Configuration (UserDict.UserDict): if Loggers.has_key(log): self['log'] = self.newLogger(log) else: - self.warn(i18n._("invalid log option '%s'") % log) + warn(i18n._("invalid log option '%s'") % log) except ConfigParser.Error, msg: debug(NIGHTMARE, msg) try: if cfgparser.getboolean(section, "verbose"): @@ -492,7 +483,7 @@ class Configuration (UserDict.UserDict): try: num = cfgparser.getint(section, "recursionlevel") if num<0: - self.error(i18n._("illegal recursionlevel number %d") % num) + error(i18n._("illegal recursionlevel number %d") % num) self["recursionlevel"] = num except ConfigParser.Error, msg: debug(NIGHTMARE, msg) try: @@ -501,9 +492,9 @@ class Configuration (UserDict.UserDict): try: self["strict"] = cfgparser.getboolean(section, "strict") except ConfigParser.Error, msg: debug(NIGHTMARE, msg) try: - warn = cfgparser.get(section, "warningregex") - if warn: - self["warningregex"] = re.compile(warn) + wr = cfgparser.get(section, "warningregex") + if wr: + self["warningregex"] = re.compile(wr) except ConfigParser.Error, msg: debug(NIGHTMARE, msg) try: self["warnsizebytes"] = int(cfgparser.get(section, "warnsizebytes")) except ConfigParser.Error, msg: debug(NIGHTMARE, msg) @@ -533,7 +524,7 @@ class Configuration (UserDict.UserDict): while 1: tuple = cfgparser.get(section, "extern%d" % i).split() if len(tuple)!=2: - sys.stderr.write("extern%d: syntax error %s\n"%(i, tuple)) + error(i18n._("extern%d: syntax error %s\n")%(i, tuple)) break self["externlinks"].append(getLinkPat(tuple[0], strict=int(tuple[1]))) i += 1