Python3

.travis.yml

@@ -11,6 +11,8 @@ matrix:
   include:
     - python: 2.7
       env: TOXENV=py27
+    - python: 3.7
+      env: TOXENV=py37
     - python: pypy2.7-6.0
       env: TOXENV=pypy
 

README.python

@@ -88,20 +88,20 @@ Python:
   from template import Template
 
   template = Template()
-  print template.process("someblock")
+  print(template.process("someblock"))
 
 Or just:
 
-  print Template().process("someblock")
+  print(Template().process("someblock"))
 
 You can, of course, catch a raised exception to take special action.
 
   from template import Template, TemplateException
 
   try:
-    print Template().process("someblock")
-  except TemplateException, e:
-    print >>sys.stderr, "Got exception: ", e
+    print(Template().process("someblock"))
+  except TemplateException as e:
+    print("Got exception: ", e, file=sys.stderr)
 
 The OUTPUT and OUTPUT_PATH options are honored, but do not otherwise
 change the behavior of process().
@@ -380,7 +380,7 @@ I have tried to follow a principle of least surprise here.  Dict
 lookup is attempted up to three times, first using the given key, then
 using the stringified key if possible, then using the key converted to
 an integer if possible.  Therefore the previous template snippet would
-print "number", and the other cases are exhibited thusly:
+print("number"), and the other cases are exhibited thusly:
 
   mydict = { 1: "one", "2": "two" }
 
@@ -473,9 +473,9 @@ Perl version:
 Python version:
 
   [% PYTHON %]
-    print context.include('myfile'),
+    print(context.include('myfile')),
     stash.set('foo', 'bar')
-    print 'foo value:', stash.get('foo'),
+    print('foo value:', stash.get('foo')),
   [% END %]
 
 Note that Python's print statement has semantics that may be
@@ -540,15 +540,15 @@ syntax error, and should be avoided.
 An example of a block that will cause a syntax error:
 
   [% PYTHON %]
-    print "line 1"
-      print "line 2"
+    print("line 1")
+      print("line 2")
   [% END %]
 
 Another block that will cause a syntax error:
 
   [% PYTHON %]
-      print "line 1"
-    print "line 2"
+      print("line 1")
+    print("line 2")
   [% END %]
 
 Note that leading whitespace is stripped indiscriminately; tab and
@@ -562,9 +562,9 @@ built-in Python function repr().  Example:
 
   [% x = 1; y = 2 %]
   [% PYTHON %]
-    print "x =", [% x | repr %], "; y =", [% y | repr %]
+    print("x =", [% x | repr %], "; y =", [% y | repr %])
     # Or:
-    print "x = %s; y = %s" % ([% x | repr %], [% y | repr %])
+    print("x = %s; y = %s" % ([% x | repr %], [% y | repr %]))
   [% END %]
 
 Finally, there is a standard filter "python", but it is more limited
@@ -586,7 +586,7 @@ as described above.
   [% FILTER python %]
     x = f()
     y = g()
-    print "hello world"
+    print("hello world")
   [% END %]
 
 

example.py

@@ -10,6 +10,6 @@
 t = Template()
 
 try:
-    print t.processString(TEMPLATE_TEXT, { "thing": "world" })
-except TemplateException, e:
-    print "ERROR: %s" % e
+    print(t.processString(TEMPLATE_TEXT, { "thing": "world" }))
+except TemplateException as e:
+    print("ERROR: %s" % e)

examples/hello_world.py

@@ -4,6 +4,6 @@
 template = Template()
 source   = Literal("Hello [% name or 'World' %]!")
 
-print template.process(source);
-print template.process(source, {'name':'Badger'});
+print(template.process(source))
+print(template.process(source, {'name':'Badger'}))
 

t/args_test.py

@@ -69,3 +69,4 @@ def testArgs(self):
 
 """
 
+main()

t/binop_test.py

@@ -314,3 +314,4 @@ def reset(): counter[0] = 0; return counter[0]
 one is less than two
 """
 
+main()

t/block_test.py

@@ -103,4 +103,5 @@ def testBlock(self):
 
 """
 
+main()
 

t/blocks_test.py

@@ -69,4 +69,5 @@ def testBlocks(self):
 this is block two, b is brazen
 """
 
+main()
 

t/capture_test.py

@@ -66,3 +66,4 @@ def testCapture(self):
 
 """
 
+main()

t/case_test.py

@@ -61,3 +61,4 @@ def testCase(self):
 1 1
 """
 
+main()

t/chomp_test.py

@@ -171,3 +171,4 @@ def testChomp(self):
 
 """
 
+main()

t/compile1_test.py

@@ -48,3 +48,4 @@ def testCompile(self):
 
 """
 
+main()

t/compile2_test.py

@@ -61,4 +61,5 @@ def testCompile(self):
 
 """
 
+main()
 

t/compile3_test.py

@@ -23,7 +23,7 @@ def testCompile(self):
     try:
       Template(ttcfg).process("evalpython", {})
       self.fail("did not raise exception")
-    except TemplateException, e:
+    except TemplateException as e:
       self.assertEquals("python", e.type())
       self.assertEquals("EVAL_PYTHON not set", e.info())
 
@@ -71,4 +71,5 @@ def testCompile(self):
 
 """
 
+main()
 

t/compile4_test.py

@@ -54,4 +54,5 @@ def testCompile(self):
 This is the blam file
 """
 
+main()
 

t/compile5_test.py

@@ -2,13 +2,10 @@
 import re
 import shutil
 
-import pytest
-
 from template.test import TestCase, main
 
 
 class CompileTest(TestCase):
-  @pytest.mark.xfail
   def testCompile(self):
     dir = os.path.abspath("test")
     cdir = os.path.join(dir, "tmp", "cache")
@@ -73,3 +70,4 @@ def twiddle(*args):
 This is the wam-bam file
 """
 
+main()

t/config_test.py

@@ -10,86 +10,86 @@ def testConfig(self):
     # Parser:
     parser = factory.parser({ 'PRE_CHOMP': 1, 'INTERPOLATE': True })
     self.assertTrue(parser)
-    self.assertEquals(1, parser.pre_chomp)
-    self.assertTrue(parser.interpolate)
+    self.assertEqual(1, parser.pre_chomp)
+    self.failUnless(parser.interpolate)
     parser = factory.parser({ 'POST_CHOMP': 1 })
-    self.assertTrue(parser)
+    self.failUnless(parser)
     self.assertEquals(1, parser.post_chomp)
 
     # Provider:
     provider = factory.provider({ 'INCLUDE_PATH': 'here:there',
                                   'PARSER': parser })
-    self.assertTrue(provider)
+    self.failUnless(provider)
     self.assertEquals(['here', 'there'], provider.include_path())
     self.assertEquals(1, provider.parser().post_chomp)
     provider = factory.provider({ 'INCLUDE_PATH': 'cat:mat',
                                   'ANYCASE': True,
                                   'INTERPOLATE': True })
-    self.assertTrue(provider)
+    self.failUnless(provider)
     self.assertEquals(['cat', 'mat'], provider.include_path())
     # Force the provider to instantiate a parser and check it uses the
     # correct parameters.
     text = 'The cat sat on the mat'
-    self.assertTrue(provider.fetch(Literal(text)))
-    self.assertTrue(provider.parser().anycase)
-    self.assertTrue(provider.parser().interpolate)
+    self.failUnless(provider.fetch(Literal(text)))
+    self.failUnless(provider.parser().anycase)
+    self.failUnless(provider.parser().interpolate)
 
     # Plugins:
     plugins = factory.plugins({ 'PLUGIN_BASE': ('my.plugins', 'MyPlugins') })
-    self.assertTrue(plugins)
+    self.failUnless(plugins)
     self.assertEquals([('my.plugins', 'MyPlugins'), 'template.plugin'],
                       plugins.plugin_base())
     plugins = factory.plugins({ 'LOAD_PYTHON': True,
                                 'PLUGIN_BASE': ('my.plugins', 'NewPlugins') })
-    self.assertTrue(plugins)
-    self.assertTrue(plugins.load_python())
+    self.failUnless(plugins)
+    self.failUnless(plugins.load_python())
     self.assertEquals([('my.plugins', 'NewPlugins'), 'template.plugin'],
                       plugins.plugin_base())
 
     # Filters:
     filters = factory.filters({ 'TOLERANT': True })
-    self.assertTrue(filters)
-    self.assertTrue(filters.tolerant())
+    self.failUnless(filters)
+    self.failUnless(filters.tolerant())
     filters = factory.filters({ 'TOLERANT': True })
-    self.assertTrue(filters)
-    self.assertTrue(filters.tolerant())
+    self.failUnless(filters)
+    self.failUnless(filters.tolerant())
 
     # Stash:
     stash = factory.stash({ 'foo': 10, 'bar': 20 })
-    self.assertTrue(stash)
+    self.failUnless(stash)
     self.assertEquals(10, stash.get('foo').value())
     self.assertEquals(20, stash.get('bar').value())
     stash = factory.stash({ 'foo': 30, 'bar': lambda *_: 'forty' })
-    self.assertTrue(stash)
+    self.failUnless(stash)
     self.assertEquals(30, stash.get('foo').value())
     self.assertEquals('forty', stash.get('bar').value())
 
     # Context:
     context = factory.context({})
-    self.assertTrue(context)
+    self.failUnless(context)
     context = factory.context({ 'INCLUDE_PATH': 'anywhere' })
-    self.assertTrue(context)
+    self.failUnless(context)
     self.assertEquals('anywhere',
                       context.load_templates()[0].include_path()[0])
     context = factory.context({ 'LOAD_TEMPLATES': [ provider ],
                                 'LOAD_PLUGINS': [ plugins ],
                                 'LOAD_FILTERS': [ filters ],
                                 'STASH': stash })
-    self.assertTrue(context)
+    self.failUnless(context)
     self.assertEquals(30, context.stash().get('foo').value())
-    self.assertTrue(context.load_templates()[0].parser().interpolate)
-    self.assertTrue(context.load_plugins()[0].load_python())
-    self.assertTrue(context.load_filters()[0].tolerant())
+    self.failUnless(context.load_templates()[0].parser().interpolate)
+    self.failUnless(context.load_plugins()[0].load_python())
+    self.failUnless(context.load_filters()[0].tolerant())
 
     # Service:
     service = factory.service({ 'INCLUDE_PATH': 'amsterdam' })
-    self.assertTrue(service)
+    self.failUnless(service)
     self.assertEquals(['amsterdam'],
                       service.context().load_templates()[0].include_path())
 
     # Iterator:
     iterator = factory.iterator(['foo', 'bar', 'baz'])
-    self.assertTrue(iterator)
+    self.failUnless(iterator)
     self.assertEquals('foo', iterator.get_first())
     self.assertEquals('bar', iterator.get_next())
     self.assertEquals('baz', iterator.get_next())
@@ -98,3 +98,4 @@ def testConfig(self):
     # (later)
 
 
+main()

t/constants_test.py

@@ -132,4 +132,5 @@ def counter():
 c: abw
 """
 
+main()
 

t/context_test.py

@@ -35,7 +35,7 @@ def testContext(self):
     error = None
     try:
       tmpl = ctx.template('no_such_template')
-    except Exception, e:
+    except Exception as e:
       error = e
     self.assertTrue(error)
     self.assertEquals('file error - no_such_template: not found', str(error))
@@ -102,7 +102,7 @@ def __init__(self, text):
     try:
       plugin = ctx.plugin('no_such_plugin')
       self.fail('Exception not raised')
-    except Exception, e:
+    except Exception as e:
       self.assertEquals('plugin error - no_such_plugin: plugin not found',
                         str(e))
 
@@ -147,3 +147,4 @@ def __init__(self, text):
     self.assertEquals('charlie', stash.get('a').value())
 
 
+main()

t/datafile_test.py

@@ -41,3 +41,4 @@ def testDatafile(self):
 
 """
 
+main()

t/date_test.py

@@ -205,3 +205,4 @@ def testDate(self):
 
 """
 
+main()

t/directive_test.py

@@ -358,3 +358,4 @@ def testDirectives(self):
 
 """
 
+main()

t/directory_test.py

@@ -247,3 +247,4 @@ def testDirectory(self):
 # 
 """
 
+main()

t/document_test.py

@@ -117,3 +117,4 @@ def testDocument(self):
 two, three
 """
 
+main()

t/error_test.py

@@ -8,8 +8,9 @@ def testError(self):
     try:
       tmpl.process("badinc")
       self.fail("Failed to raise exception")
-    except TemplateException, e:
-      self.assertEquals('file', e.type())
-      self.assertEquals('nosuchfile: not found', e.info())
+    except TemplateException as e:
+      self.assertEqual('file', e.type())
+      self.assertEqual('nosuchfile: not found', e.info())
 
 
+main()