Refactor raw conversion on split_unquoted_newlines

vmuriart · vmuriart · commit b04b5d326175 · 2016-06-12T12:32:57.000-07:00
diff --git a/sqlparse/filters/others.py b/sqlparse/filters/others.py
@@ -6,7 +6,6 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 from sqlparse import sql, tokens as T
-from sqlparse.compat import text_type
 from sqlparse.utils import split_unquoted_newlines
 
 
@@ -114,6 +113,5 @@ def process(self, stmt):
 class SerializerUnicode(object):
     @staticmethod
     def process(stmt):
-        raw = text_type(stmt)
-        lines = split_unquoted_newlines(raw)
+        lines = split_unquoted_newlines(stmt)
         return '\n'.join(line.rstrip() for line in lines)
diff --git a/sqlparse/utils.py b/sqlparse/utils.py
@@ -9,6 +9,7 @@
 import re
 from collections import deque
 from contextlib import contextmanager
+from sqlparse.compat import text_type
 
 # This regular expression replaces the home-cooked parser that was here before.
 # It is much faster, but requires an extra post-processing step to get the
@@ -33,11 +34,12 @@
 LINE_MATCH = re.compile(r'(\r\n|\r|\n)')
 
 
-def split_unquoted_newlines(text):
+def split_unquoted_newlines(stmt):
     """Split a string on all unquoted newlines.
 
     Unlike str.splitlines(), this will ignore CR/LF/CR+LF if the requisite
     character is inside of a string."""
+    text = text_type(stmt)
     lines = SPLIT_REGEX.split(text)
     outputlines = ['']
     for line in lines:
diff --git a/tests/utils.py b/tests/utils.py
@@ -8,7 +8,7 @@
 import unittest
 
 from sqlparse.utils import split_unquoted_newlines
-from sqlparse.compat import u, StringIO
+from sqlparse.compat import StringIO
 
 DIR_PATH = os.path.dirname(__file__)
 FILES_DIR = os.path.join(DIR_PATH, 'files')
@@ -30,8 +30,8 @@ def ndiffAssertEqual(self, first, second):
             # Using the built-in .splitlines() method here will cause incorrect
             # results when splitting statements that have quoted CR/CR+LF
             # characters.
-            sfirst = split_unquoted_newlines(u(first))
-            ssecond = split_unquoted_newlines(u(second))
+            sfirst = split_unquoted_newlines(first)
+            ssecond = split_unquoted_newlines(second)
             diff = difflib.ndiff(sfirst, ssecond)
 
             fp = StringIO()
