minor improvement

This commit is contained in:
Miroslav Stampar 2011-05-14 20:09:37 +00:00
parent 3484a4426b
commit c3bb5a03e1
2 changed files with 4 additions and 4 deletions

View File

@ -653,7 +653,7 @@ def dataToStdout(data, forceOutput=False):
warnMsg = "cannot properly display Unicode characters " warnMsg = "cannot properly display Unicode characters "
warnMsg += "inside Windows OS command prompt " warnMsg += "inside Windows OS command prompt "
warnMsg += "(http://bugs.python.org/issue1602). All " warnMsg += "(http://bugs.python.org/issue1602). All "
warnMsg += "similar occurances will result in " warnMsg += "unhandled occurances will result in "
warnMsg += "replacement with '?' character. Please, find " warnMsg += "replacement with '?' character. Please, find "
warnMsg += "proper character representation inside " warnMsg += "proper character representation inside "
warnMsg += "coresponding output files. " warnMsg += "coresponding output files. "
@ -1798,7 +1798,7 @@ def getUnicode(value, encoding=None, system=False):
if isinstance(value, unicode): if isinstance(value, unicode):
return value return value
elif isinstance(value, basestring): elif isinstance(value, basestring):
return unicode(value, encoding or UNICODE_ENCODING, errors="replace") return unicode(value, encoding or UNICODE_ENCODING, errors="xmlcharrefreplace")
else: else:
return unicode(value) # encoding ignored for non-basestring instances return unicode(value) # encoding ignored for non-basestring instances
else: else:

View File

@ -85,7 +85,7 @@ def urldecode(value, encoding=None):
result = urllib.unquote_plus(value) result = urllib.unquote_plus(value)
if isinstance(result, str): if isinstance(result, str):
result = unicode(result, encoding or UNICODE_ENCODING, errors="replace") result = unicode(result, encoding or UNICODE_ENCODING, errors="xmlcharrefreplace")
return result return result
@ -137,7 +137,7 @@ def unicodeencode(value, encoding=None):
try: try:
retVal = value.encode(encoding or UNICODE_ENCODING) retVal = value.encode(encoding or UNICODE_ENCODING)
except UnicodeEncodeError: except UnicodeEncodeError:
retVal = value.encode(UNICODE_ENCODING, "replace") retVal = value.encode(UNICODE_ENCODING, "xmlcharrefreplace")
return retVal return retVal
def utf8encode(value): def utf8encode(value):