Renamed Reader class to Loader.

pystache/custom_template.py

@@ -9,7 +9,8 @@ import os.path
 
 from .context import Context
 from .locator import Locator as TemplateLocator
-from .loader import Reader
+# TODO: remove this alias.
+from pystache.loader import Loader as Reader
 from .renderer import Renderer
 
 

pystache/loader.py

@@ -14,7 +14,7 @@ import sys
 DEFAULT_DECODE_ERRORS = 'strict'
 
 
-class Reader(object):
+class Loader(object):
 
     def __init__(self, encoding=None, decode_errors=None):
         """

pystache/renderer.py

@@ -10,9 +10,10 @@ import os
 import sys
 
 from .context import Context
+# TODO: remove this alias.
+from .loader import Loader as Reader
 from .locator import DEFAULT_EXTENSION
 from .locator import Locator
-from .loader import Reader
 from .renderengine import RenderEngine
 
 

tests/test_custom_template.py

@@ -18,7 +18,8 @@ from pystache import Renderer
 from pystache import View
 from pystache.custom_template import Loader as CustomLoader
 from pystache.locator import Locator
-from pystache.loader import Reader
+# TODO: remove this alias.
+from pystache.loader import Loader as Reader
 from .common import AssertIsMixin
 from .common import AssertStringMixin
 from .common import DATA_DIR

tests/test_loader.py

@@ -10,7 +10,8 @@ import sys
 import unittest
 
 from .common import AssertStringMixin
-from pystache.loader import Reader
+# TODO: remove this alias.
+from pystache.loader import Loader as Reader
 
 
 DATA_DIR = 'tests/data'

tests/test_locator.py

@@ -10,8 +10,9 @@ import os
 import sys
 import unittest
 
+# TODO: remove this alias.
+from pystache.loader import Loader as Reader
 from pystache.locator import Locator
-from pystache.loader import Reader
 
 from .common import DATA_DIR
 from data.views import SayHello