Renamed template.py to renderer.py.

pystache/commands.py

@@ -20,7 +20,7 @@ import sys
 #   ValueError: Attempted relative import in non-package
 #
 from pystache.loader import Loader
-from pystache.template import Template
+from pystache.renderer import Template
 
 
 USAGE = """\

pystache/init.py

@@ -5,7 +5,7 @@ This module contains the initialization logic called by __init__.py.
 
 """
 
-from .template import Template
+from .renderer import Template
 from .view import View
 from .loader import Loader
 

pystache/view.py

@@ -10,7 +10,7 @@ from types import UnboundMethodType
 
 from .context import Context
 from .loader import Loader
-from .template import Template
+from .renderer import Template
 
 
 class View(object):

tests/test_pystache.py

@@ -2,7 +2,7 @@
 
 import unittest
 import pystache
-from pystache import template
+from pystache import renderer
 
 
 class PystacheTests(object):
@@ -114,16 +114,16 @@ class PystacheWithoutMarkupsafeTests(PystacheTests, unittest.TestCase):
     """Test pystache without markupsafe enabled."""
 
     def setUp(self):
-        self.original_markupsafe = template.markupsafe
-        template.markupsafe = None
+        self.original_markupsafe = renderer.markupsafe
+        renderer.markupsafe = None
 
     def tearDown(self):
-        template.markupsafe = self.original_markupsafe
+        renderer.markupsafe = self.original_markupsafe
 
 
 # If markupsafe is available, then run the same tests again but without
 # disabling markupsafe.
-_BaseClass = unittest.TestCase if template.markupsafe else object
+_BaseClass = unittest.TestCase if renderer.markupsafe else object
 class PystacheWithMarkupsafeTests(PystacheTests, _BaseClass):
 
     """Test pystache with markupsafe enabled."""
@@ -132,5 +132,5 @@ class PystacheWithMarkupsafeTests(PystacheTests, _BaseClass):
     non_strings_expected = """(123 & ['something'])(chris & 0.9)"""
 
     def test_markupsafe_available(self):
-        self.assertTrue(template.markupsafe, "markupsafe isn't available.  "
+        self.assertTrue(renderer.markupsafe, "markupsafe isn't available.  "
             "The with-markupsafe tests shouldn't be running.")

tests/test_template.py → tests/test_renderer.py

@@ -9,8 +9,8 @@ import codecs
 import sys
 import unittest
 
-from pystache import template
-from pystache.template import Template
+from pystache import renderer
+from pystache.renderer import Template
 
 
 class TemplateTestCase(unittest.TestCase):
@@ -22,8 +22,8 @@ class TemplateTestCase(unittest.TestCase):
         Disable markupsafe.
 
         """
-        self.original_markupsafe = template.markupsafe
-        template.markupsafe = None
+        self.original_markupsafe = renderer.markupsafe
+        renderer.markupsafe = None
 
     def tearDown(self):
         self._restore_markupsafe()
@@ -36,7 +36,7 @@ class TemplateTestCase(unittest.TestCase):
         Restore markupsafe to its original state.
 
         """
-        template.markupsafe = self.original_markupsafe
+        renderer.markupsafe = self.original_markupsafe
 
     def test__was_markupsafe_imported(self):
         """
@@ -141,7 +141,7 @@ class TemplateTestCase(unittest.TestCase):
         # Check the standard case.
         actual = _template.literal("abc")
         self.assertEquals(actual, "abc")
-        self.assertEquals(type(actual), template.markupsafe.Markup)
+        self.assertEquals(type(actual), renderer.markupsafe.Markup)
 
         s = "é"
         # Check that markupsafe respects default_encoding.