More replacements from open() to codecs.open(). conf.dataEncoding has to be used only for non-binary files.

This commit is contained in:
Bernardo Damele
2010-05-29 10:10:28 +00:00
parent 84778f0e6c
commit 89c721a451
7 changed files with 35 additions and 19 deletions

View File

@@ -96,7 +96,7 @@ def __urllib2Opener():
urllib2.install_opener(opener)
def __feedTargetsDict(reqFile, addedTargetUrls):
fp = codecs.open(reqFile, "rb", conf.dataEncoding)
fp = codecs.open(reqFile, "rb")
fread = fp.read()
fread = fread.replace("\r", "")
@@ -745,7 +745,7 @@ def __setHTTPUserAgent():
logger.debug(debugMsg)
try:
fd = open(conf.userAgentsFile, "r")
fd = codecs.open(conf.userAgentsFile, "r", conf.dataEncoding)
except IOError:
warnMsg = "unable to read HTTP User-Agent header "
warnMsg += "file '%s'" % conf.userAgentsFile