', '='*50) - print('
%s:
\n' % url) + print(('

', '='*50)) + print(('
%s:
\n' % url)) n = Hierarchy(hierarchy, url, menuCSSClass='menu', crumbCSSClass='crumb', prefix='/here') - print(n.menuList()) - print('

', '-'*50) - print(n.crumbs()) + print((n.menuList())) + print(('

', '-'*50)) + print((n.crumbs())) --- ./Cheetah/Tools/MondoReport.py (original) +++ ./Cheetah/Tools/MondoReport.py (refactored) @@ -262,7 +262,7 @@ start = self._index - length return PrevNextPage(self._origList, length, start) - def next(self): + def __next__(self): if self._index + self.length() == self.length(): return None else: --- ./Cheetah/Tests/xmlrunner.py (original) +++ ./Cheetah/Tests/xmlrunner.py (refactored) @@ -12,7 +12,7 @@ import traceback import unittest try: - from StringIO import StringIO + from io import StringIO except ImportError: from io import StringIO from xml.sax.saxutils import escape --- ./Cheetah/Tests/Unicode.py (original) +++ ./Cheetah/Tests/Unicode.py (refactored) @@ -10,7 +10,7 @@ import unittest from Cheetah.Template import Template from Cheetah import CheetahWrapper -from Cheetah.compat import PY2, unicode +from Cheetah.compat import PY2, str class CommandLineTest(unittest.TestCase): @@ -52,10 +52,10 @@ other = otherT() t.other = other - t.v = u'Unicode String' - t.other.v = u'Unicode String' - - assert unicode(t()) + t.v = 'Unicode String' + t.other.v = 'Unicode String' + + assert str(t()) class JBQ_UTF8_Test2(unittest.TestCase): @@ -68,10 +68,10 @@ other = otherT() t.other = other --- ./Cheetah/Tests/Template.py (original) +++ ./Cheetah/Tests/Template.py (refactored) @@ -8,7 +8,7 @@ import unittest from Cheetah.Template import Template -from Cheetah.compat import unicode +from Cheetah.compat import str class TemplateTest(unittest.TestCase): @@ -338,7 +338,7 @@ class Sub(Template): greeting = 'Hola' tmpl = SubRefactoringTool: Refactored ./Cheetah/Tests/SyntaxAndOutput.py WARNING: couldn't encode ./Cheetah/Tests/SyntaxAndOutput.py's diff for your terminal RefactoringTool: Refactored ./Cheetah/Tests/Regressions.py RefactoringTool: Refactored ./Cheetah/Tests/Pinger.py RefactoringTool: Refactored ./Cheetah/Tests/Performance.py ('''When we meet, I say "${greeting}"''') - self.assertEqual(unicode(tmpl), 'When we meet, I say "Hola"') + self.assertEqual(str(tmpl), 'When we meet, I say "Hola"') ################################################## # if run from the command line ## --- ./Cheetah/Tests/SyntaxAndOutput.py (original) +++ ./Cheetah/Tests/SyntaxAndOutput.py (refactored) @@ -103,7 +103,7 @@ 'nameList': [('john', 'doe'), ('jane', 'smith')], 'letterList': ['a', 'b', 'c'], '_': lambda x: 'Translated: ' + x, - 'unicodeData': u'aoeu12345\u1234', + 'unicodeData': 'aoeu12345\u1234', } @@ -171,9 +171,9 @@ ) moduleCode = templateObj._CHEETAH_generatedModuleCode if self.DEBUGLEV >= 1: - print("Module: %s" % templateObj.__module__) - print( - moduleCode.encode('ascii', 'backslashreplace').decode('ascii')) + print(("Module: %s" % templateObj.__module__)) + print(( + moduleCode.encode('ascii', 'backslashreplace').decode('ascii'))) try: # rather than __str__, because of unicode output = templateObj.respond() @@ -731,12 +731,12 @@ """ # self.verify(u"$unicodeData", defaultTestNameSpace['unicodeData'], # outputEncoding='utf8') - self.verify(u"$unicodeData", defaultTestNameSpace['unicodeData']) + self.verify("$unicodeData", defaultTestNameSpace['unicodeData']) def test2(self): """unicode data in body """ - self.verify(u"aoeu12345\u1234", u"aoeu12345\u1234") + self.verify("aoeu12345\u1234", "aoeu12345\u1234") # self.verify(u"#encoding utf8#aoeu12345\u1234", u"aoeu12345\u1234") @@ -757,7 +757,7 @@ if not PY2: source = source.decode('utf-8') self.verify(source, - u'\u1234', outputEncoding='utf8') + '\u1234', outputEncoding='utf8') def test4(self): """basic #encoding """ @@ -765,12 +765,12 @@ if not PY2: source = source.decode('latin-1') self.verify(source, - u"\xe1\x88\xb4") + "\xe1\x88\xb4") def test5(self): """basic #encoding """ self.verify("#encoding latin-1\nAndr\202", - u'Andr\202') + 'Andr\202') def test6(self): '''Using #encoding on the second line''' @@ -779,33 +779,33 @@ if not PY2: source = source.decode('utf-8') self.verify(source, - u'\u1234', outputEncoding='utf8') + '\u1234', outputEncoding='utf8') class UnicodeDirective(OutputTest): def test1(self): """basic #unicode """ self.verify("#unicode utf-8\n1234", - u"1234") + "1234") self.verify("#unicode ascii\n1234", - u"1234") + "1234") self.verify("#unicode latin-1\n1234", - u"1234") + "1234") --- ./Cheetah/Tests/Regressions.py (original) +++ ./Cheetah/Tests/Regressions.py (refactored) @@ -3,7 +3,7 @@ import unittest import Cheetah.NameMapper import Cheetah.Template -from Cheetah.compat import unicode # noqa +from Cheetah.compat import str # noqa class GetAttrException(Exception): @@ -23,7 +23,7 @@ def test_ValidException(self): o = CustomGetAttrClass() try: - print(o.attr) + print((o.attr)) except GetAttrException as e: # expected return --- ./Cheetah/Tests/Pinger.py (original) +++ ./Cheetah/Tests/Pinger.py (refactored) @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from Cheetah.Template import Template --- ./Cheetah/Tests/Performance.py (original) +++ ./Cheetah/Tests/Performance.py (refactored) @@ -11,7 +11,7 @@ import Cheetah.NameMapper import Cheetah.Template -from Cheetah.compat import unicode +from Cheetah.compat import str # TRefactoringTool: Refactored ./Cheetah/Tests/Parser.py RefactoringTool: No changes to ./Cheetah/Tests/NameMapper_pure.py RefactoringTool: Refactored ./Cheetah/Tests/NameMapper.py RefactoringTool: No changes to ./Cheetah/Tests/Misc.py RefactoringTool: Refactored ./Cheetah/Tests/Filters.py RefactoringTool: No changes to ./Cheetah/Tests/Cheps.py RefactoringTool: Refactored ./Cheetah/Tests/CheetahWrapper.py RefactoringTool: Refactored ./Cheetah/Tests/Boinker.py RefactoringTool: No changes to ./Cheetah/Tests/Analyzer.py RefactoringTool: Refactored ./Cheetah/Templates/_SkeletonPage.py his can be turned on with the `--debug` flag when running the test # and will cause the tests to all just dump out how long they took @@ -63,8 +63,8 @@ pystone_total_time = total_time / pystone_rate global DEBUG if DEBUG: - print('The test "%s" took: %s pystones' % ( - function.__name__, pystone_total_time)) + print(('The test "%s" took: %s pystones' % ( + function.__name__, pystone_total_time))) else: if pystone_total_time > (max_num_pystones + TOLERANCE): raise DurationError( @@ -105,8 +105,8 @@ self.prof.stop() self.prof.close() if self.display: - print('>>> %s (%d iterations) ' % (self.__class__.__name__, - self.iterations)) + print(('>>> %s (%d iterations) ' % (self.__class__.__name__, + self.iterations))) stats = hotshot.stats.load('%s.prof' % self.__class__.__name__) # stats.strip_dirs() stats.sort_stats('time', 'calls') @@ -164,7 +164,7 @@ template = Cheetah.Template.Template.compile( template, keepRefToGeneratedCode=False) template = template() - template = unicode(template) + template = str(template) class FilterTest(PerformanceTest): @@ -184,7 +184,7 @@ self.template = template() def performanceSample(self): - value = unicode(self.template) # noqa: F841 + value = str(self.template) # noqa: F841 class LongCompileTest(PerformanceTest): --- ./Cheetah/Tests/Parser.py (original) +++ ./Cheetah/Tests/Parser.py (refactored) @@ -27,11 +27,11 @@ """ self.al.add_argument('a') self.al.add_default('999') - self.al.next() + next(self.al) self.al.add_argument('b') self.al.add_default('444') - expect = [(u'a', u'999'), (u'b', u'444')] + expect = [('a', '999'), ('b', '444')] self.assertEqual(expect, self.al.merge()) --- ./Cheetah/Tests/NameMapper.py (original) +++ ./Cheetah/Tests/NameMapper.py (refactored) @@ -94,7 +94,7 @@ 'anObj.meth3': 'A string', }) -for k in testNamespace.keys(): +for k in list(testNamespace.keys()): # put them in the globals for the valueFromFrame tests exec('%s = testNamespace[k]' % k) --- ./Cheetah/Tests/Filters.py (original) +++ ./Cheetah/Tests/Filters.py (refactored) @@ -26,7 +26,7 @@ template = str(template) assert template == expected except ImportError as ex: - print('>>> We probably failed to import markdown, bummer %s' % ex) + print(('>>> We probably failed to import markdown, bummer %s' % ex)) return except Exception as ex: raise --- ./Cheetah/Tests/CheetahWrapper.py (original) +++ ./Cheetah/Tests/CheetahWrapper.py (refactored) @@ -563,7 +563,7 @@ break m = rx.search(lin) if m: - print(m.group(1)) + print((m.group(1))) f.close() --- ./Cheetah/Tests/Boinker.py (original) +++ ./Cheetah/Tests/Boinker.py (refactored) @@ -1,4 +1,4 @@ -from __future__ import absolute_import + from Cheetah.Template import Template --- ./Cheetah/Templates/_SkeletonPage.py (original) +++ ./Cheetah/Templates/_SkeletonPage.py (refactored) @@ -70,7 +70,7 @@ the correct order.""" stylesheetTagsTxt = '' - for title, src in self._stylesheetLibs.items(): + for title, src in list(self._stylesheetLibs.items()): stylesheetTagsTxt += \ '\n' @@ -90,7 +90,7 @@ attribsDict = self._stylesheets[identifier] cssCode = '' attribCode = '' - for k, v in attribsDict.items(): + for k, v RefactoringTool: Refactored ./Cheetah/Templates/SkeletonPage.py in list(attribsDict.items()): attribCode += str(k) + ': ' + str(v) + '; ' attribCode = attribCode[:-2] # get rid of the last semicolon @@ -113,7 +113,7 @@ """ javascriptTagsTxt = [] - for key, details in self._javascriptTags.items(): + for key, details in list(self._javascriptTags.items()): if not isinstance(details, (list, tuple)): details = ['', details] @@ -122,7 +122,7 @@ '" type="text/javascript">\n'] - for key, details in self._javascriptLibs.items(): + for key, details in list(self._javascriptLibs.items()): if not isinstance(details, (list, tuple)): details = ['', details] @@ -198,7 +198,7 @@ def formHTMLTag(self, tagName, attributes={}): """returns a string containing an HTML """ tagTxt = ['<', tagName.lower()] - for name, val in attributes.items(): + for name, val in list(attributes.items()): tagTxt += [' ', name.lower(), '="', str(val), '"'] tagTxt.append('>') return ''.join(tagTxt) @@ -207,12 +207,12 @@ """format a dict of metaTag definitions into an HTML version""" metaTagsTxt = [] if 'HTTP-EQUIV' in metaTags: - for http_equiv, contents in metaTags['HTTP-EQUIV'].items(): + for http_equiv, contents in list(metaTags['HTTP-EQUIV'].items()): metaTagsTxt += ['\n'] if 'NAME' in metaTags: - for name, contents in metaTags['NAME'].items(): + for name, contents in list(metaTags['NAME'].items()): metaTagsTxt += ['\n'] return ''.join(metaTagsTxt) --- ./Cheetah/Templates/SkeletonPage.py (original) +++ ./Cheetah/Templates/SkeletonPage.py (refactored) @@ -13,7 +13,7 @@ try: import builtins as builtin except ImportError: - import __builtin__ as builtin + import builtins as builtin from os.path import getmtime, exists import time import types @@ -25,7 +25,7 @@ from Cheetah.CacheRegion import CacheRegion import Cheetah.Filters as Filters import Cheetah.ErrorCatchers as ErrorCatchers -from Cheetah.compat import unicode +from Cheetah.compat import str from Cheetah.Templates._SkeletonPage import _SkeletonPage ################################################## @@ -63,7 +63,7 @@ if not self._CHEETAH__instanceInitialized: cheetahKWArgs = {} allowedKWs = 'searchList namespaces filter filtersLib errorCatcher'.split() - for k,v in KWs.items(): + for k,v in list(KWs.items()): if k in allowedKWs: cheetahKWArgs[k] = v self._initCheetahInstance(**cheetahKWArgs) @@ -87,23 +87,23 @@ ######################################## ## START - generated method body - write(u''' + write(''' + if _v is not None: write(_filter(_v, rawExpr='$title')) # from line 24, col 8. + write(''' ''') _v = VFSL([locals()]+SL+[globals(), builtin],"metaTags",True) # u'$metaTags' on line 25, col 1 - if _v is not None: write(_filter(_v, rawExpr=u'$metaTags')) # from line 25, col 1. - write(u''' + if _v is not None: write(_filter(_v, rawExpr='$metaTags')) # from line 25, col 1. + write(''' ''') _v = VFSL([locals()]+SL+[globals(), builtin],"stylesheetTags",True) # u'$stylesheetTags' on line 26, col 1 - if _v is not None: write(_filter(_v, rawExpr=u'$stylesheetTags')) # from line 26, col 1. - write(u''' + if _v is not None: write(_filter(_v, rawExpr='$stylesheetTags')) # from line 26, col 1. + write(''' ''') _v = VFSL([locals()]+SL+[globals(), builtin],"javascriptTags",True) # u'$javascriptTags' on line 27, col 1 - if _v is not None: write(_filter(_v, rawExpr=u'$javascriptTags')) # from line 27, col 1. - write(u''' + if _v is not None: write(_filter(_v, rawExpr='$javascriptTags')) # from line 27, col 1. + write(''' ''') @@ -132,7 +132,7 @@ ######################################## ## START - generated method body - write(u'''This skeleton page has no flesh. Its body needs to be implemented. + write('''This skeleton page has no flesh. Its body needs to be implemented. ''') ######################################## @@ -162,10 +162,10 @@ ## START CACHE REGION: ID=header. line 6, col 1 in the source. _RECACHE_header = False - _cacheRegion_header = self.getCacheRegion(regionID=u'header', cacheInfo={'type': 2, u'id': u'header'}) + _cacheRegion_header = self.getCacheRegion(regionID='header', cacheInfo={'type': 2, 'id': 'header'}) if _cacheRegion_header.isNew(): _RECACHE_header = True - _cacheItem_header = _cacheRegion_header.getCacheItem(u'header') + _cacheItem_header = _cacheRegion_header.getCacheItem('header') if _cacheItem_header.hasExpired(): _RECACHE_header = True if (not _RECACHE_header) and _cacheItem_header.getRefreshTime(): @@ -181,40 +181,40 @@ trans = _cacheCollector_header = DummyTransaction() write = _cacheCollector_header.response().write _v = VFSL([locals()]+SL+[globals(), builtin],"docType",True) # u'$docType' on line 7, col 1 - if _v is not None: write(_filter(_v, rawExpr=u'$docType')) # from line 7, col 1. - write(u''' + if _v is not None: write(_filter(_v, rawExpr='$docType')) # from line 7, col 1. + write(''' ''') _v = VFSL([locals()]+SL+[globals(), builtin],"htmlTag",True) # u'$htmlTag' on line 8, col 1 - if _v is not None: write(_filter(_v, rawExpr=u'$htmlTag')) # from line 8, col 1. - write(u''' + if _v is not None: write(_filter(_v, rawExpr='$htmlTag')) # from line 8, col 1. + write(''' ''') self.writeHeadTag(trans=trans) - write(u''' + write(''' ''') trans = _orig_transheader write = trans.response().write @@ -226,15 +226,15 @@ del _orig_transheader ## END CACHE REGION: header - write(u''' + write(''' ''') _v = VFSL([locals()]+SL+[globals(), builtin],"bodyTag",True) # u'$bodyTag' on line 34, col 1 - if _v is not None: write(_filter(_v, rawExpr=u'$bodyTag')) # from line 34, col 1. - write(u''' + if _v is not None: write(_filter(_v, rawExpr='$bodyTag')) # from line 34, col 1. + write(''' ''') self.writeBody(trans=trans) - write(u''' + write(''' @@ -265,7 +265,7 @@ _CHEETAH_srcLastModified = __CHEETAH_srcLastModified__ - _mainCheetahMethod_for_SkeletonPage= u'respond' + _mainCheetahMethod_for_SkeletonPage= 'respond' ## END CLASS DEFINITION --- ./Cheetah/TemplateCmdLineIface.py (original) +++ ./Cheetah/TemplateCmdLineIface.py (refactored) @@ -4,7 +4,7 @@ import getopt import os.path try: - from cPickle import load + from pickle import load except ImportError: from pickle import load @@ -30,7 +30,7 @@ """The main program controller.""" self._processCmdLineArgs() - print(self._template) + print((self._template)) def _processCmdLineArgs(self): try: @@ -41,12 +41,12 @@ except getopt.GetoptError as v: # print help information and exit: print(v) - print(self.usage()) + print((self.usage())) sys.exit(2) for o, a in self._opts: if o in ('-h', '--help'): - print(self.usage()) + print((self.usage())) sys.exit() if o == '--env': self._template.searchList().insert(0, os.environ) --- ./Cheetah/Template.py (original) +++ ./Cheetah/Template.py (refactored) @@ -16,7 +16,7 @@ import inspect import io try: - from StringIO import StringIO + from io import StringIO except ImportError: from io import StringIO import traceback @@ -40,7 +40,7 @@ from Cheetah.Version import MinCompatibleVersion from Cheetah.Version import convertVersionStringToTuple, \ MinCompatibleVersionTuple -from Cheetah.compat import PY2, string_type, unicode +from Cheetah.compat import PY2, string_type, str from Cheetah.convertTmplPathToModuleName import convertTmplPathToModuleName try: @@ -156,7 +156,7 @@ """ settings = self._settings if not source: # @@TR: this needs improving - if isinstance(file, (str, unicode)): # it's a filename. + if isinstance(file, str): # it's a filename. f = open(file) source = f.read() f.close() @@ -809,7 +809,7 @@ mod = types.ModuleType(str(uniqueModuleName)) if moduleGlobals: - for k, v in moduleGlobals.items(): + for k, v in list(moduleGlobals.items()): setattr(mod, k, v) mod.__file__ = __file__ if __orig_file__ and os.path.exists(__orig_file__): @@ -917,7 +917,7 @@ if isinstance(arg, str) or isinstance(arg, (list, tuple)): settings.tokens = arg elif isinstance(arg, dict): - for k, v in arg.items(): + for k, v in list(arg.items()): setattr(settings, k, v) else: settings = arg @@ -965,7 +965,7 @@ normalizeSearchList(settings.templateInitArgs['searchList'])) if not hasattr(settings, 'outputTransformer'): - settings.outputTransformer = unicode + settings.outputTransformer = stRefactoringTool: Refactored ./Cheetah/SourceReader.py RefactoringTool: Refactored ./Cheetah/SettingsManager.py r if not hasattr(settings, 'templateAPIClass'): class PreprocessTemplateAPIClass(klass): @@ -1043,7 +1043,7 @@ if mainMethName: def __str__(self): rc = getattr(self, mainMethName)() - if PY2 and isinstance(rc, unicode): + if PY2 and isinstance(rc, str): return rc.encode('utf-8') if not PY2 and isinstance(rc, bytes): return rc.decode('utf-8') @@ -1055,7 +1055,7 @@ and concreteTemplateClass.respond != Servlet.respond): def __str__(self): rc = self.respond() - if PY2 and isinstance(rc, unicode): + if PY2 and isinstance(rc, str): return rc.encode('utf-8') if not PY2 and isinstance(rc, bytes): return rc.decode('utf-8') @@ -1072,7 +1072,7 @@ rc = self.respond() else: rc = super(self.__class__, self).__str__() - if PY2 and isinstance(rc, unicode): + if PY2 and isinstance(rc, str): return rc.encode('utf-8') if not PY2 and isinstance(rc, bytes): return rc.decode('utf-8') @@ -1407,7 +1407,7 @@ """ if not cacheRegionId: - for cacheRegion in self.getCacheRegions().values(): + for cacheRegion in list(self.getCacheRegions().values()): cacheRegion.clear() else: cregion = self._CHEETAH__cacheRegions.get(cacheRegionId) @@ -1639,7 +1639,7 @@ if not self.__class__ == Template: # Only propogate attributes if we're in a subclass of # Template - for k, v in self.__class__.__dict__.items(): + for k, v in list(self.__class__.__dict__.items()): if not v or k.startswith('__'): continue # Propogate the class attributes to the instance @@ -1958,7 +1958,7 @@ # 'dic = super(ThisClass, self).webInput(names, namesMulti, ...)' # and then the code below. if debug: - print("

\n" + pprint.pformat(dic) + "\n

\n" + pprint.pformat(dic) + "\n