diff options
| author | Andi Albrecht <albrecht.andi@gmail.com> | 2012-03-29 12:11:47 +0200 |
|---|---|---|
| committer | Andi Albrecht <albrecht.andi@gmail.com> | 2012-03-29 12:11:47 +0200 |
| commit | b887bab44ad518e6bec290774bc866badaed04c3 (patch) | |
| tree | 1e4b567ddbd0d7f252a341cad8d9fdb4244b6736 /extras | |
| parent | 0fcb7ef297e0342346c4b05e5ee6dcca587fe0f0 (diff) | |
| download | sqlparse-b887bab44ad518e6bec290774bc866badaed04c3.tar.gz | |
Update py3k patch.
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/py3k/fixes.diff | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/extras/py3k/fixes.diff b/extras/py3k/fixes.diff index 10c4f57..402e0ee 100644 --- a/extras/py3k/fixes.diff +++ b/extras/py3k/fixes.diff @@ -1,7 +1,7 @@ ---- sqlparse/sql.py~ 2009-04-30 08:38:16.000000000 +0200 -+++ sqlparse/sql.py 2009-04-30 08:39:15.000000000 +0200 -@@ -23,16 +23,13 @@ - self.ttype = ttype +--- sqlparse/sql.py.orig 2012-03-29 12:09:46.660311410 +0200 ++++ sqlparse/sql.py 2012-03-29 12:11:04.924699486 +0200 +@@ -23,17 +23,13 @@ + self.parent = None def __str__(self): - return str(self).encode('utf-8') @@ -13,21 +13,18 @@ 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.""" - return str(self) -@@ -105,11 +102,8 @@ + """Returns a unicode representation of this object. + +@@ -139,7 +135,7 @@ self.tokens = tokens Token.__init__(self, None, None) - def __unicode__(self): -- return ''.join(str(x) for x in self.flatten()) -- - def __str__(self): -- return str(self).encode('utf-8') -+ return ''.join(str(x) for x in self.flatten()) ++ def __str__(self): + return ''.join(str(x) for x in self.flatten()) def _get_repr_name(self): - return self.__class__.__name__ |