File pyramid_simpleform-fixtests.diff of Package python-pyramid_simpleform

Index: b/pyramid_simpleform/tests.py
===================================================================
--- a/pyramid_simpleform/tests.py
+++ b/pyramid_simpleform/tests.py
@@ -67,7 +67,7 @@ class TestState(unittest.TestCase):
 
 
 class TestFormencodeForm(unittest.TestCase):
-    
+
     def test_is_error(self):
         from pyramid_simpleform import Form
 
@@ -404,18 +404,17 @@ class TestFormencodeForm(unittest.TestCa
         self.assert_(form.is_validated)
  
     def test_render_without_htmlfill(self):
-
+        import pyramid
         from pyramid_simpleform import Form
 
-        request = testing.DummyRequest()
-        request.POST['name'] = 'test'
-        request.method = "POST"
-        
         settings = {}
-
         settings['mako.directories'] = 'pyramid_simpleform:templates'
-        config = Configurator(settings=settings)
+        config = pyramid.testing.setUp(settings = settings)
+        config.include('pyramid_mako')
 
+        request = testing.DummyRequest()
+        request.POST['name'] = 'test'
+        request.method = "POST"
 
         request.registry = config.registry
 
@@ -427,18 +426,17 @@ class TestFormencodeForm(unittest.TestCa
 
 
     def test_render_with_htmlfill(self):
-
+        import pyramid
         from pyramid_simpleform import Form
 
         request = testing.DummyRequest()
         request.POST['name'] = 'test'
         request.method = "POST"
-        
-        settings = {}
 
+        settings = {}
         settings['mako.directories'] = 'pyramid_simpleform:templates'
-        config = Configurator(settings=settings)
-
+        config = pyramid.testing.setUp(settings = settings)
+        config.include('pyramid_mako')
 
         request.registry = config.registry
 
Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,7 @@ except IOError:
     README = CHANGES = ''
 
 requires = [
+    'pyramid_mako',
     'pyramid',
     'webhelpers',
     'formencode',