Hopiu/linkchecker
1
0
Fork 0
mirror of https://github.com/Hopiu/linkchecker.git synced 2026-04-23 15:44:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure results are unicode

Browse source 
git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@2319 e7d03fd6-7b0d-0410-9947-9c21f3af8025
This commit is contained in:
calvin 2005-02-18 09:17:46 +00:00
parent e71e6fb281
commit 0e12b923f6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linkcheck/checker/httpurl.py
View file

@ -390,7 +390,7 @@ class HttpUrl (urlbase.UrlBase, proxysupport.ProxySupport):
Check final result and log it.
"""
if response.status >= 400:
self.set_result("%r %s" % (response.status, response.reason),
self.set_result(u"%r %s" % (response.status, response.reason),
valid=False)
else:
if self.headers and self.headers.has_key("Server"):
@ -419,9 +419,9 @@ class HttpUrl (urlbase.UrlBase, proxysupport.ProxySupport):
self.add_warning(_("Could not store cookies: %(msg)s.") %
{'msg': str(msg)})
if response.status >= 200:
self.set_result("%r %s" % (response.status, response.reason))
self.set_result(u"%r %s" % (response.status, response.reason))
else:
self.set_result("OK")
self.set_result(u"OK")
modified = self.headers.get('Last-Modified', '')
if modified:
self.add_info(_("Last modified %s.") % modified)

6
linkcheck/checker/urlbase.py
View file

@ -271,7 +271,7 @@ class UrlBase (object):
try:
self.build_url()
except linkcheck.LinkCheckerError, msg:
self.set_result(str(msg), valid=False)
self.set_result(unicode(str(msg)), valid=False)
return False
self.set_cache_keys()
self.extern = self._get_extern(self.url)
@ -375,7 +375,7 @@ class UrlBase (object):
# make nicer error msg for bad status line
if isinstance(evalue, linkcheck.httplib2.BadStatusLine):
evalue = _('Bad HTTP response %r') % str(evalue)
self.set_result(str(evalue), valid=False)
self.set_result(unicode(str(evalue)), valid=False)
# check content
warningregex = self.consumer.config["warningregex"]
@ -387,7 +387,7 @@ class UrlBase (object):
value, tb = sys.exc_info()[1:]
linkcheck.log.debug(linkcheck.LOG_CHECK, "exception %s",
traceback.format_tb(tb))
self.set_result(str(value), valid=False)
self.set_result(unicode(str(value)), valid=False)
self.checktime = time.time() - t
# check recursion