Use compat module for single Python 2/3 code base.

This change includes minor fixes and code cleanup too.

1 files changed, 13 insertions, 12 deletions

diff --git a/tests/test_grouping.py b/tests/test_grouping.py
index 5ade830..fa68ab2 100644
--- a/tests/test_grouping.py
+++ b/tests/test_grouping.py
@@ -5,6 +5,7 @@ import pytest
 import sqlparse
 from sqlparse import sql
 from sqlparse import tokens as T
+from sqlparse.compat import u
 
 from tests.utils import TestCaseBase
 
@@ -26,7 +27,7 @@ class TestGrouping(TestCaseBase):
     def test_comments(self):
         s = '/*\n * foo\n */   \n  bar'
         parsed = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(parsed))
+        self.ndiffAssertEqual(s, u(parsed))
         self.assertEqual(len(parsed.tokens), 2)
 
     def test_assignment(self):
@@ -42,18 +43,18 @@ class TestGrouping(TestCaseBase):
     def test_identifiers(self):
         s = 'select foo.bar from "myscheme"."table" where fail. order'
         parsed = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(parsed))
+        self.ndiffAssertEqual(s, u(parsed))
         self.assert_(isinstance(parsed.tokens[2], sql.Identifier))
         self.assert_(isinstance(parsed.tokens[6], sql.Identifier))
         self.assert_(isinstance(parsed.tokens[8], sql.Where))
         s = 'select * from foo where foo.id = 1'
         parsed = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(parsed))
+        self.ndiffAssertEqual(s, u(parsed))
         self.assert_(isinstance(parsed.tokens[-1].tokens[-1].tokens[0],
                                 sql.Identifier))
         s = 'select * from (select "foo"."id" from foo)'
         parsed = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(parsed))
+        self.ndiffAssertEqual(s, u(parsed))
         self.assert_(isinstance(parsed.tokens[-1].tokens[3], sql.Identifier))
 
         s = "INSERT INTO `test` VALUES('foo', 'bar');"
@@ -141,44 +142,44 @@ class TestGrouping(TestCaseBase):
     def test_where(self):
         s = 'select * from foo where bar = 1 order by id desc'
         p = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(p))
+        self.ndiffAssertEqual(s, u(p))
         self.assertTrue(len(p.tokens), 16)
         s = 'select x from (select y from foo where bar = 1) z'
         p = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(p))
+        self.ndiffAssertEqual(s, u(p))
         self.assertTrue(isinstance(p.tokens[-1].tokens[0].tokens[-2], sql.Where))
 
     def test_typecast(self):
         s = 'select foo::integer from bar'
         p = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(p))
+        self.ndiffAssertEqual(s, u(p))
         self.assertEqual(p.tokens[2].get_typecast(), 'integer')
         self.assertEqual(p.tokens[2].get_name(), 'foo')
         s = 'select (current_database())::information_schema.sql_identifier'
         p = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(p))
+        self.ndiffAssertEqual(s, u(p))
         self.assertEqual(p.tokens[2].get_typecast(),
                          'information_schema.sql_identifier')
 
     def test_alias(self):
         s = 'select foo as bar from mytable'
         p = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(p))
+        self.ndiffAssertEqual(s, u(p))
         self.assertEqual(p.tokens[2].get_real_name(), 'foo')
         self.assertEqual(p.tokens[2].get_alias(), 'bar')
         s = 'select foo from mytable t1'
         p = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(p))
+        self.ndiffAssertEqual(s, u(p))
         self.assertEqual(p.tokens[6].get_real_name(), 'mytable')
         self.assertEqual(p.tokens[6].get_alias(), 't1')
         s = 'select foo::integer as bar from mytable'
         p = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(p))
+        self.ndiffAssertEqual(s, u(p))
         self.assertEqual(p.tokens[2].get_alias(), 'bar')
         s = ('SELECT DISTINCT '
              '(current_database())::information_schema.sql_identifier AS view')
         p = sqlparse.parse(s)[0]
-        self.ndiffAssertEqual(s, unicode(p))
+        self.ndiffAssertEqual(s, u(p))
         self.assertEqual(p.tokens[4].get_alias(), 'view')
 
     def test_alias_case(self):  # see issue46