Change Loader.load_template() to Loader.get().

pystache/commands.py

@@ -55,7 +55,7 @@ def main(sys_argv):
         template = template[:-9]
 
     try:
-        template = Loader().load_template(template)
+        template = Loader().get(template)
     except IOError:
         pass
 

pystache/loader.py

@@ -52,7 +52,7 @@ class Loader(object):
 
         return file_name
 
-    def load_template(self, template_name):
+    def get(self, template_name):
         """
         Find and load the given template, and return it as a string.
 

pystache/renderer.py

@@ -22,7 +22,6 @@ except ImportError:
 
 class Renderer(object):
 
-    # TODO: change load_template to load_partial.
     def __init__(self, load_template=None, output_encoding=None, escape=None,
                  default_encoding=None, decode_errors='strict'):
         """
@@ -33,7 +32,7 @@ class Renderer(object):
           load_template: a function for loading templates by name, for
             example when loading partials.  The function should accept a
             single template_name parameter and return a template as a string.
-            Defaults to the default Loader's load_template() method.
+            Defaults to the default Loader's get() method.
 
           output_encoding: the encoding to use when rendering to a string.
             The argument should be the name of an encoding as a string, for
@@ -65,7 +64,7 @@ class Renderer(object):
         """
         if load_template is None:
             loader = Loader()
-            load_template = loader.load_template
+            load_template = loader.get
 
         if default_encoding is None:
             default_encoding = sys.getdefaultencoding()

pystache/view.py

@@ -51,7 +51,7 @@ class View(object):
             # View.__init__() has already been called.
             loader = Loader(search_dirs=self.template_path, encoding=self.template_encoding,
                             extension=self.template_extension)
-            self._load_template = loader.load_template
+            self._load_template = loader.get
 
         return self._load_template(template_name)
 

tests/test_loader.py

@@ -48,36 +48,36 @@ class LoaderTestCase(unittest.TestCase):
         loader.template_extension = ''
         self.assertEquals(loader.make_file_name('foo'), 'foo.')
 
-    def test_template_is_loaded(self):
+    def test_get__template_is_loaded(self):
         loader = Loader(search_dirs='examples')
-        template = loader.load_template('simple')
+        template = loader.get('simple')
 
         self.assertEqual(template, 'Hi {{thing}}!{{blank}}')
 
-    def test_using_list_of_paths(self):
+    def test_get__using_list_of_paths(self):
         loader = Loader(search_dirs=['doesnt_exist', 'examples'])
-        template = loader.load_template('simple')
+        template = loader.get('simple')
 
         self.assertEqual(template, 'Hi {{thing}}!{{blank}}')
 
-    def test_non_existent_template_fails(self):
+    def test_get__non_existent_template_fails(self):
         loader = Loader()
 
-        self.assertRaises(IOError, loader.load_template, 'doesnt_exist')
+        self.assertRaises(IOError, loader.get, 'doesnt_exist')
 
-    def test_load_template__extensionless_file(self):
+    def test_get__extensionless_file(self):
         loader = Loader(search_dirs=self.search_dirs)
-        self.assertRaises(IOError, loader.load_template, 'extensionless')
+        self.assertRaises(IOError, loader.get, 'extensionless')
 
         loader.template_extension = False
-        self.assertEquals(loader.load_template('extensionless'), "No file extension: {{foo}}")
+        self.assertEquals(loader.get('extensionless'), "No file extension: {{foo}}")
 
-    def test_load_template__unicode_return_value(self):
+    def test_get__load_template__unicode_return_value(self):
         """
         Check that load_template() returns unicode strings.
 
         """
         loader = Loader(search_dirs=self.search_dirs)
-        template = loader.load_template('simple')
+        template = loader.get('simple')
 
         self.assertEqual(type(template), unicode)