', '='*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/RecursiveNull.py (original) +++ ./cheetah/Tools/RecursiveNull.py (refactored) @@ -17,7 +17,7 @@ return '' def __repr__(self): return '' - def __nonzero__(self): + def __bool__(self): return 0 def __eq__(self, x): if x: --- ./cheetah/Tools/MondoReport.py (original) +++ ./cheetah/Tools/MondoReport.py (refactored) @@ -250,7 +250,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) @@ -13,10 +13,10 @@ import time import traceback import unittest -from StringIO import StringIO +from io import StringIO from xml.sax.saxutils import escape -from StringIO import StringIO +from io import StringIO @@ -279,7 +279,7 @@ """ class TestTest(unittest.TestCase): def test_foo(self): - self.assert_(False) + self.assertTrue(False) self._try_test_run(TestTest, """ Foobar --- ./cheetah/Tests/Unicode.py (original) +++ ./cheetah/Tests/Unicode.py (refactored) @@ -37,10 +37,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): def runTest(self): @@ -52,10 +52,10 @@ other = otherT() t.other = other --- ./cheetah/Tests/Test.py (original) +++ ./cheetah/Tests/Test.py (refactored) @@ -46,7 +46,7 @@ if __name__ == '__main__': runner = unittest.TextTestRunneRefactoringTool: Refactored ./cheetah/Tests/Template.py RefactoringTool: Refactored ./cheetah/Tests/SyntaxAndOutput.py WARNING: couldn't encode ./cheetah/Tests/SyntaxAndOutput.py's diff for your terminal RefactoringTool: Refactored ./cheetah/Tests/Regressions.py r() if 'xml' in sys.argv: - import xmlrunner + from . import xmlrunner runner = xmlrunner.XMLTestRunner(filename='Cheetah-Tests.xml') results = runner.run(unittest.TestSuite(suites)) --- ./cheetah/Tests/Template.py (original) +++ ./cheetah/Tests/Template.py (refactored) @@ -305,7 +305,7 @@ try: rc = template.myClassMethod(foo='bar') assert rc == '$foo = bar', (rc, 'Template class method didn\'t return what I expected') - except AttributeError, ex: + except AttributeError as ex: self.fail(ex) class StaticMethodSupport(TemplateTest): @@ -323,7 +323,7 @@ try: rc = template.myStaticMethod(foo='bar') assert rc == '$foo = bar', (rc, 'Template class method didn\'t return what I expected') - except AttributeError, ex: + except AttributeError as ex: self.fail(ex) class Useless(object): @@ -354,7 +354,7 @@ class Sub(Template): greeting = 'Hola' tmpl = Sub('''When we meet, I say "${greeting}"''') - self.assertEquals(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) @@ -104,7 +104,7 @@ 'nameList': [('john', 'doe'), ('jane', 'smith')], 'letterList': ['a', 'b', 'c'], '_': lambda x: 'Translated: ' + x, - 'unicodeData': u'aoeu12345\u1234', + 'unicodeData': 'aoeu12345\u1234', } @@ -708,12 +708,12 @@ """unicode data in placeholder """ #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") class EncodingDirective(OutputTest): @@ -730,48 +730,48 @@ def test3(self): """basic #encoding """ self.verify("#encoding utf-8\n\xe1\x88\xb4", - u'\u1234', outputEncoding='utf8') + '\u1234', outputEncoding='utf8') def test4(self): """basic #encoding """ self.verify("#encoding latin-1\n\xe1\x88\xb4", - 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''' self.verify("""### Comments on the first line #encoding utf-8\n\xe1\x88\xb4""", - 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) @@ -29,8 +29,8 @@ def test_ValidException(self): o = CustomGetAttrClass() try: - print(o.attr) - except GetAttrException, e: + print((o.attr)) + except GetAttrException as e: # expected return except: @@ -47,7 +47,7 @@ template = template(searchList=[{'obj' : CustomGetAttrClass()}]) assert tempRefactoringTool: Refactored ./cheetah/Tests/Performance.py RefactoringTool: Refactored ./cheetah/Tests/Parser.py late, 'We should have a valid template object by now' - self.failUnlessRaises(GetAttrException, template.raiseme) + self.assertRaises(GetAttrException, template.raiseme) class InlineImportTest(unittest.TestCase): @@ -97,7 +97,7 @@ This should totally $fail ''' - self.failUnlessRaises(ImportError, Cheetah.Template.Template.compile, template, compilerSettings={'useLegacyImportMode' : False}, keepRefToGeneratedCode=True) + self.assertRaises(ImportError, Cheetah.Template.Template.compile, template, compilerSettings={'useLegacyImportMode' : False}, keepRefToGeneratedCode=True) def test_AutoImporting(self): template = ''' @@ -105,7 +105,7 @@ Boo! ''' - self.failUnlessRaises(ImportError, Cheetah.Template.Template.compile, template) + self.assertRaises(ImportError, Cheetah.Template.Template.compile, template) def test_StuffBeforeImport_Legacy(self): template = ''' @@ -115,7 +115,7 @@ #extends Foo Bar ''' - self.failUnlessRaises(ImportError, Cheetah.Template.Template.compile, template, compilerSettings={'useLegacyImportMode' : True}, keepRefToGeneratedCode=True) + self.assertRaises(ImportError, Cheetah.Template.Template.compile, template, compilerSettings={'useLegacyImportMode' : True}, keepRefToGeneratedCode=True) class Mantis_Issue_11_Regression_Test(unittest.TestCase): @@ -134,7 +134,7 @@ import cgi template = Cheetah.Template.Template("$escape($request)", searchList=[{'escape' : cgi.escape, 'request' : 'foobar'}]) assert template - self.failUnlessRaises(AttributeError, template.respond) + self.assertRaises(AttributeError, template.respond) def test_FailingBehaviorWithSetting(self): --- ./cheetah/Tests/Performance.py (original) +++ ./cheetah/Tests/Performance.py (refactored) @@ -57,8 +57,8 @@ pystone_total_time = total_time / pystone_rate global DEBUG if DEBUG: - print('The test "%s" took: %s pystones' % (function.func_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((('Test too long (%.2f Ps, ' @@ -98,8 +98,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') @@ -154,7 +154,7 @@ template = Cheetah.Template.Template.compile(template, keepRefToGeneratedCode=False) template = template() - template = unicode(template) + template = str(template) class FilterTest(PerformanceTest): @@ -173,7 +173,7 @@ self.template = template() def performanceSample(self): - value = unicode(self.template) + value = str(self.template) class LongCompileTest(PerformanceTest): --- ./cheetah/Tests/Parser.py (original) +++ ./cheetah/Tests/Parser.py (refactored) @@ -16,7 +16,7 @@ self.al.add_argument('arg') expect = [('arg', None)] - self.assertEquals(expect, self.al.merge()) + self.assertEqual(expect, self.al.merge()) def test_merge2(self): ''' @@ -24,13 +24,13 @@ ''' 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', '444RefactoringTool: Refactored ./cheetah/Tests/NameMapper.py RefactoringTool: Refactored ./cheetah/Tests/Misc.py RefactoringTool: Refactored ./cheetah/Tests/Filters.py RefactoringTool: Refactored ./cheetah/Tests/Cheps.py RefactoringTool: Refactored ./cheetah/Tests/CheetahWrapper.py ')] - self.assertEquals(expect, self.al.merge()) + self.assertEqual(expect, self.al.merge()) @@ -42,7 +42,7 @@ self.al.add_default("'This is my block'") expect = [('arg', "'This is my block'")] - self.assertEquals(expect, self.al.merge()) + self.assertEqual(expect, self.al.merge()) if __name__ == '__main__': unittest.main() --- ./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) @@ -537,7 +537,7 @@ #def intify(val) #return $int(val) #end def''', compilerSettings={'useStackFrames' : False}) - self.assertEquals(5, t.intify('5')) + self.assertEqual(5, t.intify('5')) --- ./cheetah/Tests/Misc.py (original) +++ ./cheetah/Tests/Misc.py (refactored) @@ -12,7 +12,7 @@ expect = {'xyz': (10, 9), 'foo': 'bar', 'abc': {'a': 1, 'c': (3,), 'b': 2}} result = SettingsManager.mergeNestedDictionaries(left, right) - self.assertEquals(result, expect) + self.assertEqual(result, expect) if __name__ == '__main__': --- ./cheetah/Tests/Filters.py (original) +++ ./cheetah/Tests/Filters.py (refactored) @@ -28,12 +28,12 @@ template = Cheetah.Template.Template(template, searchList=[{'foo' : 'bar'}]) template = str(template) assert template == expected - except ImportError, ex: - print('>>> We probably failed to import markdown, bummer %s' % ex) + except ImportError as ex: + print(('>>> We probably failed to import markdown, bummer %s' % ex)) return - except Exception, ex: + except Exception as ex: if ex.__class__.__name__ == 'MarkdownException' and majorVer == 2 and minorVer < 5: - print('>>> NOTE: Support for the Markdown filter will be broken for you. Markdown says: %s' % ex) + print(('>>> NOTE: Support for the Markdown filter will be broken for you. Markdown says: %s' % ex)) return raise --- ./cheetah/Tests/Cheps.py (original) +++ ./cheetah/Tests/Cheps.py (refactored) @@ -25,7 +25,7 @@ ''' try: template = Cheetah.Template.Template.compile(template) - except Cheetah.Parser.ParseError, ex: + except Cheetah.Parser.ParseError as ex: self.fail('Failed to properly generate code %s' % ex) template = template() rc = tepmlate.funky('abc def') --- ./cheetah/Tests/CheetahWrapper.py (original) +++ ./cheetah/Tests/CheetahWrapper.py (refactored) @@ -111,7 +111,7 @@ path = os.path.abspath(path) exists = os.path.exists(path) msg = "destination file missing: %s" % path - self.failUnless(exists, msg) + self.assertTrue(exists, msg) f = open(path, 'r') result = f.read() f.close() @@ -120,7 +120,7 @@ else: success = result == expected msg = errmsg % locals() - self.failUnless(success, msg) + self.assertTrue(success, msg) def checkCompile(self, path): @@ -148,11 +148,11 @@ """ exists = os.path.exists(path) msg = "destination subdirectory %s misssing" % path - self.failUnless(exists, msg) + self.assertTrue(exists, msg) initPath = os.path.join(path, "__init__.py") exists = os.path.exists(initPath) msg = "destination init file missing: %s" % initPath - self.failUnless(exists, msg) + self.assertTrue(exists, msg) def checkNoBackup(self, path): @@ -160,7 +160,7 @@ """ exists = os.path.exists(path) msg = "backup file exists in spite of --nobackup: %s" % path - self.failIf(exists, msg) + self.assertFalse(exists, msg) def locatRefactoringTool: Refactored ./cheetah/Tests/Analyzer.py RefactoringTool: Refactored ./cheetah/Templates/_SkeletonPage.py e_cheetah(self, cmd): paths = os.getenv('PATH') @@ -201,10 +201,10 @@ status, output = self.assertPosixSubprocess(cmd) if not nonzero: - self.failUnlessEqual(status, 0, '''Subprocess exited with a non-zero status (%d) + self.assertEqual(status, 0, '''Subprocess exited with a non-zero status (%d) %s''' % (status, output)) else: - self.failIfEqual(status, 0, '''Subprocess exited with a zero status (%d) + self.assertNotEqual(status, 0, '''Subprocess exited with a zero status (%d) %s''' % (status, output)) return output @@ -224,7 +224,7 @@ msg = "substring %r not found in subcommand output: %s" % \ (expectedOutputSubstring, cmd) substringTest = output.find(expectedOutputSubstring) != -1 - self.failUnless(substringTest, msg) + self.assertTrue(substringTest, msg) class CFIdirBase(CFBase): @@ -543,7 +543,7 @@ break m = rx.search(lin) if m: - print(m.group(1)) + print((m.group(1))) f.close() def main(): --- ./cheetah/Tests/Analyzer.py (original) +++ ./cheetah/Tests/Analyzer.py (refactored) @@ -12,7 +12,7 @@ Hello ${foo}! ''' calls = DirectiveAnalyzer.analyze(template) - self.assertEquals(1, calls.get('set')) + self.assertEqual(1, calls.get('set')) def test_compilersettings(self): template = ''' @@ -21,7 +21,7 @@ #end compiler-settings ''' calls = DirectiveAnalyzer.analyze(template) - self.assertEquals(1, calls.get('compiler-settings')) + self.assertEqual(1, calls.get('compiler-settings')) if __name__ == '__main__': --- ./cheetah/Templates/_SkeletonPage.py (original) +++ ./cheetah/Templates/_SkeletonPage.py (refactored) @@ -77,7 +77,7 @@ the correct order.""" stylesheetTagsTxt = '' - for title, src in self._stylesheetLibs.items(): + for title, src in list(self._stylesheetLibs.items()): stylesheetTagsTxt += '\n' if not self._stylesheetsOrder: @@ -95,7 +95,7 @@ attribsDict = self._stylesheets[identifier] cssCode = '' attribCode = '' - for k, v in attribsDict.items(): + for k, v in list(attribsDict.items()): attribCode += str(k) + ': ' + str(v) + '; ' attribCode = attribCode[:-2] # get rid of the last semicolon @@ -115,7 +115,7 @@ SRC filename rather than a code string.""" javascriptTagsTxt = [] - for key, details in self._javascriptTags.iteritems(): + for key, details in self._javascriptTags.items(): if not isinstance(details, (list, tuple)): details = ['', details] @@ -124,7 +124,7 @@ str(details[0]), '\n//-->\n'] - for key, details in self._javascriptLibs.iteritems(): + for key, details in self._javascriptLibs.items(): if not isinstance(details, (list, tuple)): details = ['', details] @@ -194,7 +194,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) @@ -203,12 +203,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) @@ -12,7 +12,7 @@ from os.path import getmtime, exists import time import types -import __builtin__ +import builtins from Cheetah.Version import MinCompatibleVersion as RequiredCheetahVersion from Cheetah.Version import MinCompatibleVersionTuple as RequiredCheetahVersionTuple from Cheetah.Template import Template @@ -62,7 +62,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) --- ./cheetah/TemplateCmdLineIface.py (original) +++ ./cheetah/TemplateCmdLineIface.py (refactored) @@ -17,7 +17,7 @@ import getopt import os.path try: - from cPickle import load + from pickle import load except ImportError: from pickle import load @@ -41,7 +41,7 @@ """The main program controller.""" self._processCmdLineArgs() - print(self._template) + print((self._template)) def _processCmdLineArgs(self): try: @@ -51,15 +51,15 @@ 'pickle=', ]) - except getopt.GetoptError, v: + 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) @@ -15,7 +15,7 @@ from random import randrange import imp import inspect -import StringIO +import io import traceback import pprint import cgi # Used by .webInput() if the template is a CGI script. @@ -145,7 +145,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() @@ -156,7 +156,7 @@ templateAPIClass = settings.templateAPIClass possibleKwArgs = [ arg for arg in - inspect.getargs(templateAPIClass.compile.im_func.func_code)[0] + inspect.getargs(templateAPIClass.compile.__func__.__code__)[0] if arg not in ('klass', 'source', 'file',)] compileKwArgs = {} @@ -586,10 +586,10 @@ """ errmsg = "arg '%s' must be %s" - if not isinstance(source, (types.NoneType, basestring)): + if not isinstance(source, (type(None), str)): raise TypeError(errmsg % ('source', 'string or None')) - if not isinstance(file, (types.NoneType, basestring, filetype)): + if not isinstance(file, (type(None), str, filetype)): raise TypeError(errmsg % ('file', 'string, file-like object, or None')) @@ -598,7 +598,7 @@ if isinstance(baseclass, Template): baseclass = baseclass.__class__ - if not isinstance(baseclass, (types.NoneType, basestring, type)): + if not isinstance(baseclass, (type(None), str, type)): raise TypeError(errmsg % ('baseclass', 'string, class or None')) if cacheCompilationResults is Unspecified: @@ -629,11 +629,11 @@ if not isinstance(keepRefToGeneratedCode, (int, bool)): raise TypeError(errmsg % ('keepReftoGeneratedCode', 'boolean')) - if not isinstance(moduleName, (types.NoneType, basestring)): + if not isinstance(moduleName, (type(None), str)): raise TypeError(errmsg % ('moduleName', 'string or None')) __orig_file__ = None if not moduleName: - if file and isinstance(file, basestring): + if file and isinstance(file, str): moduleName = convertTmplPathToModuleName(file) __orig_file__ = file else: @@ -642,14 +642,14 @@ if className is Unspecified: className = klass._CHEETAH_defaultClassNameForTemplates - if not isinstance(className, (types.NoneType, basestring)): + if not isinstance(className, (type(None), str)): raise TypeError(errmsg % ('className', 'string or None')) className = re.sub(r'^_+([^0-9])',r'\1', className or moduleName) if mainMethodName is Unspecified: mainMethodName = klass._CHEETAH_defaultMainMethodNameForTemplates - if not isinstance(mainMethodName, (types.NoneType, basestring)): + if not isinstance(mainMethodName, (type(None), str)): raise TypeError(errmsg % ('mainMethodName', 'string or None')) if moduleGlobals is Unspecified: @@ -665,7 +665,7 @@ if cacheDirForModuleFiles is Unspecified: cacheDirForModuleFiles = klass._CHEETAH_cacheDirForModuleFiles - if not isinstance(cacheDirForModuleFiles, (types.NoneType, basestring)): + if not isinstance(cacheDirForModuleFiles, (type(None), str)): raise TypeError(errmsg % ('cacheDirForModuleFiles', 'string or None')) @@ -680,7 +680,7 @@ baseclassValue = None baseclassName = None if baseclass: - if isinstance(baseclass, basestring): + if isinstance(baseclass, str): baseclassName = baseclass elif isinstance(baseclass, type): # @@TR: should soft-code this @@ -690,7 +690,7 @@ cacheHash = None cacheItem = None - if source or isinstance(file, basestring): + if source or isinstance(file, str): compilerSettingsHash = None if compilerSettings: compilerSettingsHash = hashDict(compilerSettings) @@ -773,7 +773,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__): @@ -786,7 +786,7 @@ try: co = compile(generatedModuleCode, __file__, 'exec') exec(co, mod.__dict__) - except SyntaxError, e: + except SyntaxError as e: try: parseError = genParserErrorFromPythonException( source, file, generatedModuleCode, exception=e) @@ -796,7 +796,7 @@ raise e else: raise parseError - except Exception, e: + except Exception as e: updateLinecache(__file__, generatedModuleCode) e.generatedModuleCode = generatedModuleCode raise @@ -881,7 +881,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 @@ -930,7 +930,7 @@ normalizeSearchList(settings.templateInitArgs['searchList'])) if not hasattr(settings, 'outputTransformer'): - settings.outputTransformer = unicode + settings.outputTransformer = str if not hasattr(settings, 'templateAPIClass'): class PreprocessTemplateAPIClass(klass): pass @@ -981,13 +981,13 @@ for methodname in klass._CHEETAH_requiredCheetahMethods: if not hasattr(concreteTemplateClass, methodname): method = getattr(Template, methodname) - newMethod = createMethod(method.im_func, concreteTemplateClass) + newMethod = createMethod(method.__func__, concreteTemplateClass) setattr(concreteTemplateClass, methodname, newMethod) for classMethName in klass._CHEETAH_requiredCheetahClassMethods: if not hasattr(concreteTemplateClass, classMethName): meth = getattr(klass, classMethName) - setattr(concreteTemplateClass, classMethName, classmethod(meth.im_func)) + setattr(concreteTemplateClass, classMethName, classmethod(meth.__func__)) for attrname in klass._CHEETAH_requiredCheetahClassAttributes: attrname = '_CHEETAH_'+attrname @@ -1003,7 +1003,7 @@ if mainMethName: def __str__(self): rc = getattr(self, mainMethName)() - if isinstance(rc, unicode): + if isinstance(rc, str): return rc.encode('utf-8') return rc def __unicode__(self): @@ -1012,7 +1012,7 @@ and concreteTemplateClass.respond!=Servlet.respond): def __str__(self): rc = self.respond() - if isinstance(rc, unicode): + if isinstance(rc, str): return rc.encode('utf-8') return rc def __unicode__(self): @@ -1026,7 +1026,7 @@ rc = self.respond() else: rc = super(self.__class__, self).__str__() - if isinstance(rc, unicode): + if isinstance(rc, str): return rc.encode('utf-8') return rc def __unicode__(self): @@ -1168,26 +1168,26 @@ errmsg = "arg '%s' must be %s" errmsgextra = errmsg + "\n%s" - if not isinstance(source, (types.NoneType, basestring)): + if not isinstance(source, (type(None), str)): raise TypeError(errmsg % ('source', 'string or None')) - if not isinstance(file, (types.NoneType, basestring, filetype)): + if not isinstance(file, (type(None), str, filetype)): raise TypeError(errmsg % ('file', 'string, file open for reading, or None')) - if not isinstance(filter, (basestring, types.TypeType)) and not \ + if not isinstance(filter, (str, type)) and not \ (isinstance(filter, type) and issubclass(filter, Filters.Filter)): raise TypeError(errmsgextra % ('filter', 'string or class', '(if class, must be subclass of Cheetah.Filters.Filter)')) - if not isinstance(filtersLib, (basestring, types.ModuleType)): + if not isinstance(filtersLib, (str, types.ModuleType)): raise TypeError(errmsgextra % ('filtersLib', 'string or module', '(if module, must contain subclasses of Cheetah.Filters.Filter)')) if not errorCatcher is None: err = True - if isinstance(errorCatcher, (basestring, types.TypeType)): + if isinstance(errorCatcher, (str, tyRefactoringTool: Refactored ./cheetah/SourceReader.py pe)): err = False if isinstance(errorCatcher, type) and \ issubclass(errorCatcher, ErrorCatchers.ErrorCatcher): @@ -1197,7 +1197,7 @@ ('errorCatcher', 'string, class or None', '(if class, must be subclass of Cheetah.ErrorCatchers.ErrorCatcher)')) if compilerSettings is not Unspecified: - if not isinstance(compilerSettings, types.DictType): + if not isinstance(compilerSettings, dict): raise TypeError(errmsg % ('compilerSettings', 'dictionary')) @@ -1329,7 +1329,7 @@ """ if not cacheRegionId: - for cacheRegion in self.getCacheRegions().itervalues(): + for cacheRegion in self.getCacheRegions().values(): cacheRegion.clear() else: cregion = self._CHEETAH__cacheRegions.get(cacheRegionId) @@ -1435,7 +1435,7 @@ Type 'python yourtemplate.py --help to see what it's capabable of. """ - from TemplateCmdLineIface import CmdLineIface + from .TemplateCmdLineIface import CmdLineIface CmdLineIface(templateObj=self).run() ################################################## @@ -1494,7 +1494,7 @@ # @@TR: consider allowing simple callables as the filter argument self._CHEETAH__filtersLib = filtersLib self._CHEETAH__filters = {} - if isinstance(filter, basestring): + if isinstance(filter, str): filterName = filter klass = getattr(self._CHEETAH__filtersLib, filterName) else: @@ -1505,7 +1505,7 @@ self._CHEETAH__errorCatchers = {} if errorCatcher: - if isinstance(errorCatcher, basestring): + if isinstance(errorCatcher, str): errorCatcherClass = getattr(ErrorCatchers, errorCatcher) elif isinstance(errorCatcher, type): errorCatcherClass = errorCatcher @@ -1541,7 +1541,7 @@ self._fileMtime = None self._fileDirName = None self._fileBaseName = None - if file and isinstance(file, basestring): + if file and isinstance(file, str): file = self.serverSidePath(file) self._fileMtime = os.path.getmtime(file) self._fileDirName, self._fileBaseName = os.path.split(file) @@ -1555,7 +1555,7 @@ if not self.__class__ == Template: # Only propogate attributes if we're in a subclass of # Template - for k, v in self.__class__.__dict__.iteritems(): + for k, v in self.__class__.__dict__.items(): if not v or k.startswith('__'): continue ## Propogate the class attributes to the instance @@ -1580,7 +1580,7 @@ if not raw: if includeFrom == 'file': source = None - if isinstance(srcArg, basestring): + if isinstance(srcArg, str): if hasattr(self, 'serverSidePath'): file = path = self.serverSidePath(srcArg) else: @@ -1854,7 +1854,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