[Checkins] SVN: z3c.pt/trunk/src/z3c/pt/ Fixed tests.

[Malthe Borch]

Log message for revision 120602:
  Fixed tests.

Changed:
  U   z3c.pt/trunk/src/z3c/pt/loader.py
  U   z3c.pt/trunk/src/z3c/pt/tests/test_loader.py

-=-
Modified: z3c.pt/trunk/src/z3c/pt/loader.py
===================================================================
--- z3c.pt/trunk/src/z3c/pt/loader.py	2011-02-28 14:00:01 UTC (rev 120601)
+++ z3c.pt/trunk/src/z3c/pt/loader.py	2011-02-28 14:02:48 UTC (rev 120602)
@@ -1,15 +1,8 @@
-import errno
-import os.path
-
 from z3c.pt.pagetemplate import PageTemplateFile
-# from z3c.pt.texttemplate import TextTemplateFile
 
 from chameleon import loader
 
+
 class TemplateLoader(loader.TemplateLoader):
     def load_page(self, filename):
         return self.load(filename, PageTemplateFile)
-
-    #def load_text(self, filename):
-    #    return self.load(filename, TextTemplateFile)
-

Modified: z3c.pt/trunk/src/z3c/pt/tests/test_loader.py
===================================================================
--- z3c.pt/trunk/src/z3c/pt/tests/test_loader.py	2011-02-28 14:00:01 UTC (rev 120601)
+++ z3c.pt/trunk/src/z3c/pt/tests/test_loader.py	2011-02-28 14:02:48 UTC (rev 120602)
@@ -1,9 +1,9 @@
 import unittest
 
 class LoadTests:
-    def _makeOne(self, search_path=None, auto_reload=False, cachedir=None):
+    def _makeOne(self, search_path=None, **kwargs):
         klass = self._getTargetClass()
-        return klass(search_path, auto_reload, cachedir)
+        return klass(search_path, **kwargs)
 
     def _getTargetClass(self):
         from z3c.pt.loader import TemplateLoader
@@ -13,7 +13,7 @@
         import os
         here = os.path.dirname(__file__)
         loader = self._makeOne(search_path = [here])
-        
+
         result = self._load(loader, 'view.pt')
         self.assertEqual(result.filename, os.path.join(here, 'view.pt'))
 
@@ -21,7 +21,7 @@
         import os
         here = os.path.dirname(__file__)
         loader = self._makeOne(search_path = [here])
-        
+
         self.assertTrue(
             self._load(loader, 'view.pt') is self._load(loader, 'view.pt'))
 
@@ -44,10 +44,6 @@
     def _load(self, loader, filename):
         return loader.load_page(filename)
 
-# class LoadTextTests(unittest.TestCase, LoadTests):
-#     def _load(self, loader, filename):
-#         return loader.load_text(filename)
-
 def test_suite():
     import sys
     return unittest.findTestCases(sys.modules[__name__])