Merge pull request #88 from nostrict/patch-1

Unicode-escape for binary data (sqlparse/lexer.py)

1 files changed, 4 insertions, 1 deletions

diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
index 4cec0db..e769d7b 100644
--- a/sqlparse/lexer.py
+++ b/sqlparse/lexer.py
@@ -233,7 +233,10 @@ class Lexer(object):
             except UnicodeDecodeError:
                 text = text.decode('latin1')
         else:
-            text = text.decode(self.encoding)
+            try:
+                text = text.decode(self.encoding)
+            except UnicodeDecodeError:
+                text = text.decode('unicode-escape')
 
         if self.tabsize > 0:
             text = text.expandtabs(self.tabsize)