Merge remote-tracking branch 'origin' into metadata

This commit is contained in:
Jim Miller 2015-05-12 17:54:38 -05:00
commit e61371d5c4

View file

@ -81,10 +81,10 @@ def removeEntities(text):
try:
t = text.decode('utf-8')
except UnicodeEncodeError, e:
except (UnicodeEncodeError,UnicodeDecodeError), e:
try:
t = text.encode ('ascii', 'xmlcharrefreplace')
except UnicodeEncodeError, e:
except (UnicodeEncodeError,UnicodeDecodeError), e:
t = text
text = t
# replace numeric versions of [&<>] with named versions,