Simplify error handling when decoding unicode

This commit is contained in:
Matt Sweeney
2012-09-26 12:38:36 -07:00
parent b1610df282
commit 38aced9f90
+1 -4
View File
@@ -828,13 +828,10 @@ class Response(object):
# Decode unicode from given encoding.
try:
content = str(self.content, encoding, errors='replace')
except LookupError:
except (LookupError, TypeError):
# A LookupError is raised if the encoding was not found which could
# indicate a misspelling or similar mistake.
#
# So we try blindly encoding.
content = str(self.content, errors='replace')
except TypeError:
# A TypeError can be raised if encoding is None
#
# So we try blindly encoding.