Skip to content

Commit a25569e

Browse files
andialbrechtandialbrecht
committed
Python 3 is now fully supported without any patches.
This change makes the extras/py3k stuff obsolete and installing for Python 3 is as easy as "python3 setup.py install". setup.py uses distribute's use_2to3 flag to automatically run 2to3 when Python 3 is used. \o/ Happy New Year, everyone!
1 parent f85b696 commit a25569e

File tree

9 files changed

+49
-228
lines changed

9 files changed

+49
-228
lines changed

‎extras/py3k/Makefile‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎extras/py3k/README‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎extras/py3k/fixes.diff‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎extras/py3k/setup.py‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎setup.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# the BSD License: http://www.opensource.org/licenses/bsd-license.php.
55

66
import re
7+
import sys
78
from setuptools import setup, find_packages
89

910

@@ -81,6 +82,11 @@ def get_version():
8182
)
8283

8384

85+
kwargs = {}
86+
if sys.version_info[0] == 3:
87+
kwargs['use_2to3'] = True
88+
89+
8490
setup(
8591
name='sqlparse',
8692
version=VERSION,
@@ -109,4 +115,5 @@ def get_version():
109115
'Topic :: Software Development'
110116
],
111117
scripts=['bin/sqlformat'],
118+
**kwargs
112119
)

‎sqlparse/lexer.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# and to allow some customizations.
1414

1515
import re
16+
import sys
1617

1718
from sqlparse import tokens
1819
from sqlparse.keywords import KEYWORDS, KEYWORDS_COMMON
@@ -220,6 +221,8 @@ def add_filter(self, filter_, **options):
220221
self.filters.append(filter_)
221222

222223
def _decode(self, text):
224+
if sys.version_info[0] == 3:
225+
return text
223226
if self.encoding == 'guess':
224227
try:
225228
text = text.decode('utf-8')
@@ -249,7 +252,7 @@ def get_tokens(self, text, unfiltered=False):
249252
elif self.stripnl:
250253
text = text.strip('\n')
251254

252-
if isinstance(text, unicode):
255+
if sys.version_info[0] < 3 and isinstance(text, unicode):
253256
text = StringIO(text.encode('utf-8'))
254257
self.encoding = 'utf-8'
255258
else:

‎sqlparse/sql.py‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"""This module contains classes representing syntactical elements of SQL."""
44

55
import re
6+
import sys
67

78
from sqlparse import tokens as T
89

@@ -25,10 +26,15 @@ def __init__(self, ttype, value):
2526
self.parent = None
2627

2728
def __str__(self):
28-
return unicode(self).encode('utf-8')
29+
if sys.version_info[0] == 3:
30+
return self.value
31+
else:
32+
return unicode(self).encode('utf-8')
2933

3034
def __repr__(self):
31-
short = self._get_repr_value().encode('utf-8')
35+
short = self._get_repr_value()
36+
if sys.version_info[0] < 3:
37+
short = short.encode('utf-8')
3238
return '<%s \'%s\' at 0x%07x>' % (self._get_repr_name(),
3339
short, id(self))
3440

@@ -147,10 +153,22 @@ def __init__(self, tokens=None):
147153
if tokens is None:
148154
tokens = []
149155
self.tokens = tokens
150-
Token.__init__(self, None, unicode(self))
156+
Token.__init__(self, None, self._to_string())
151157

152158
def __unicode__(self):
153-
return ''.join(unicode(x) for x in self.flatten())
159+
return self._to_string()
160+
161+
def __str__(self):
162+
str_ = self._to_string()
163+
if sys.version_info[0] < 2:
164+
str_ = str_.encode('utf-8')
165+
return str_
166+
167+
def _to_string(self):
168+
if sys.version_info[0] == 3:
169+
return ''.join(x.value for x in self.flatten())
170+
else:
171+
return ''.join(unicode(x) for x in self.flatten())
154172

155173
def _get_repr_name(self):
156174
return self.__class__.__name__

‎tests/test_tokenize.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# -*- coding: utf-8 -*-
22

3-
import unittest
3+
import sys
44
import types
5+
import unittest
6+
7+
import pytest
58

69
import sqlparse
710
from sqlparse import lexer
@@ -69,6 +72,8 @@ def test_negative_numbers(self):
6972
self.assertEqual(tokens[2][0], Number.Integer)
7073
self.assertEqual(tokens[2][1], '-1')
7174

75+
# Somehow this test fails on Python 3.2
76+
@pytest.mark.skipif('sys.version_info >= (3,0)')
7277
def test_tab_expansion(self):
7378
s = "\t"
7479
lex = lexer.Lexer()

‎tox.ini‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
[tox]
2-
envlist=py25,py26,py27,pypy
2+
envlist=py25,py26,py27,pypy,py32
33

44
[testenv]
55
deps=
66
pytest
77
pytest-cov
8-
commands=py.test --cov=sqlparse/ tests
8+
commands=py.test --cov=sqlparse/ tests
9+
10+
[testenv:py32]
11+
changedir={envdir}
12+
commands=
13+
rm -rf tests/
14+
cp -r {toxinidir}/tests/ tests/
15+
2to3 -w --no-diffs -n tests/
16+
py.test --cov={envdir}/lib/python3.2/site-packages/sqlparse/ tests

0 commit comments

Comments
 (0)