Mercurial > p > roundup > code
diff roundup/cgi/cgitb.py @ 5436:e70fe1d1215b
Python 3 preparation: update tokenize use in cgitb.py.
Note that the same interface that has changed incompatibly is also
used in tools/pygettext.py. That file also needs fixing, but this
patch does *not* attempt such a fix.
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Wed, 25 Jul 2018 11:40:44 +0000 |
| parents | 1ab2c81a64df |
| children | 1a835db41674 |
line wrap: on
line diff
--- a/roundup/cgi/cgitb.py Wed Jul 25 10:44:30 2018 +0000 +++ b/roundup/cgi/cgitb.py Wed Jul 25 11:40:44 2018 +0000 @@ -11,6 +11,7 @@ import pydoc, traceback from roundup.cgi import templating, TranslationService +from roundup.anypy.strings import s2b def get_translator(i18n=None): """Return message translation function (gettext) @@ -156,12 +157,23 @@ names.append(token) if type == tokenize.NEWLINE: raise IndexError def linereader(file=file, lnum=[lnum]): - line = linecache.getline(file, lnum[0]) + line = s2b(linecache.getline(file, lnum[0])) lnum[0] = lnum[0] + 1 return line + # The interface that is tokenize.tokenize in Python 3 is + # called tokenize.generate_tokens in Python 2. However, + # Python 2 has tokenize.tokenize with a different interface, + # and Python 3 has an undocumented generate_tokens function, + # also with a different interface, so a version check is + # needed instead of checking for which functions exist. + if sys.version_info[0] > 2: + tokenize_fn = tokenize.tokenize + else: + tokenize_fn = tokenize.generate_tokens try: - tokenize.tokenize(linereader, tokeneater) + for t in tokenize_fn(linereader): + tokeneater(*t) except IndexError: pass lvals = []