diff options
| -rwxr-xr-x | extras/py3k/setup.py | 4 | ||||
| -rwxr-xr-x | setup.py | 4 | ||||
| -rw-r--r-- | sqlparse/filters.py | 8 | ||||
| -rw-r--r-- | sqlparse/sql.py | 11 | ||||
| -rw-r--r-- | tests/test_grouping.py | 24 |
5 files changed, 27 insertions, 24 deletions
diff --git a/extras/py3k/setup.py b/extras/py3k/setup.py index 79da282..a6665ff 100755 --- a/extras/py3k/setup.py +++ b/extras/py3k/setup.py @@ -55,7 +55,7 @@ Parsing:: >>> res (<Statement 'select...' at 0x9ad08ec>,) >>> stmt = res[0] - >>> stmt.to_unicode() # converting it back to unicode + >>> unicode(stmt) # converting it back to unicode u'select * from someschema.mytable where id = 1' >>> # This is how the internal representation looks like: >>> stmt.tokens @@ -87,7 +87,7 @@ setup( long_description=LONG_DESCRIPTION, license='BSD', url='http://python-sqlparse.googlecode.com/', - classifiers = [ + classifiers=[ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', @@ -55,7 +55,7 @@ Parsing:: >>> res (<Statement 'select...' at 0x9ad08ec>,) >>> stmt = res[0] - >>> stmt.to_unicode() # converting it back to unicode + >>> unicode(stmt) # converting it back to unicode u'select * from someschema.mytable where id = 1' >>> # This is how the internal representation looks like: >>> stmt.tokens @@ -87,7 +87,7 @@ setup( long_description=LONG_DESCRIPTION, license='BSD', url='http://python-sqlparse.googlecode.com/', - classifiers = [ + classifiers=[ 'Development Status :: 4 - Beta', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', diff --git a/sqlparse/filters.py b/sqlparse/filters.py index 6f9b579..9aa3f6d 100644 --- a/sqlparse/filters.py +++ b/sqlparse/filters.py @@ -350,7 +350,7 @@ class ReindentFilter(Filter): self._process(stmt) if isinstance(stmt, sql.Statement): if self._last_stmt is not None: - if self._last_stmt.to_unicode().endswith('\n'): + if unicode(self._last_stmt).endswith('\n'): nl = '\n' else: nl = '\n\n' @@ -382,7 +382,7 @@ class RightMarginFilter(Filter): and not token.__class__ in self.keep_together): token.tokens = self._process(stack, token, token.tokens) else: - val = token.to_unicode() + val = unicode(token) if len(self.line) + len(val) > self.width: match = re.search('^ +', self.line) if match is not None: @@ -456,7 +456,7 @@ class ColumnsSelect(Filter): class SerializerUnicode(Filter): def process(self, stack, stmt): - raw = stmt.to_unicode() + raw = unicode(stmt) add_nl = raw.endswith('\n') res = '\n'.join(line.rstrip() for line in raw.splitlines()) if add_nl: @@ -516,7 +516,7 @@ class OutputPythonFilter(Filter): varname = '%s%d' % (self.varname, self.cnt) else: varname = self.varname - has_nl = len(stmt.to_unicode().strip().splitlines()) > 1 + has_nl = len(unicode(stmt).strip().splitlines()) > 1 stmt.tokens = self._process(stmt.tokens, varname, self.cnt, has_nl) return stmt diff --git a/sqlparse/sql.py b/sqlparse/sql.py index 244733b..d077c1d 100644 --- a/sqlparse/sql.py +++ b/sqlparse/sql.py @@ -31,10 +31,14 @@ class Token(object): short, id(self)) def __unicode__(self): + """Returns a unicode representation of this object.""" return self.value or '' def to_unicode(self): - """Returns a unicode representation of this object.""" + """Returns a unicode representation of this object. + + @deprecated: please use __unicode__() + """ return unicode(self) def _get_repr_name(self): @@ -333,8 +337,7 @@ class TokenList(Token): alias = next_ if isinstance(alias, Identifier): return alias.get_name() - else: - return alias.to_unicode() + return unicode(alias) def get_name(self): """Returns the name of this identifier. @@ -420,7 +423,7 @@ class Identifier(TokenList): next_ = self.token_next(self.token_index(marker), False) if next_ is None: return None - return next_.to_unicode() + return unicode(next_) class IdentifierList(TokenList): diff --git a/tests/test_grouping.py b/tests/test_grouping.py index a66d39d..5f060b9 100644 --- a/tests/test_grouping.py +++ b/tests/test_grouping.py @@ -10,7 +10,7 @@ from tests.utils import TestCaseBase class TestGrouping(TestCaseBase): def test_parenthesis(self): - s ='select (select (x3) x2) and (y2) bar' + s = 'select (select (x3) x2) and (y2) bar' parsed = sqlparse.parse(s)[0] self.ndiffAssertEqual(s, str(parsed)) self.assertEqual(len(parsed.tokens), 9) @@ -39,18 +39,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, parsed.to_unicode()) + self.ndiffAssertEqual(s, unicode(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, parsed.to_unicode()) + self.ndiffAssertEqual(s, unicode(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, parsed.to_unicode()) + self.ndiffAssertEqual(s, unicode(parsed)) self.assert_(isinstance(parsed.tokens[-1].tokens[3], sql.Identifier)) def test_identifier_wildcard(self): @@ -117,44 +117,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, p.to_unicode()) + self.ndiffAssertEqual(s, unicode(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, p.to_unicode()) + self.ndiffAssertEqual(s, unicode(p)) self.assertTrue(isinstance(p.tokens[-3].tokens[-2], sql.Where)) def test_typecast(self): s = 'select foo::integer from bar' p = sqlparse.parse(s)[0] - self.ndiffAssertEqual(s, p.to_unicode()) + self.ndiffAssertEqual(s, unicode(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, p.to_unicode()) + self.ndiffAssertEqual(s, unicode(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, p.to_unicode()) + self.ndiffAssertEqual(s, unicode(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, p.to_unicode()) + self.ndiffAssertEqual(s, unicode(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, p.to_unicode()) + self.ndiffAssertEqual(s, unicode(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, p.to_unicode()) + self.ndiffAssertEqual(s, unicode(p)) self.assertEqual(p.tokens[4].get_alias(), 'view') def test_alias_case(self): # see issue46 |