Back out r69591 and r69592 (the fix for issue 680) since it broke

existing code. Need different fix.
zopefoundation · Aug 18, 2006 · 556beb9 · 556beb9
1 parent ac25632
commit 556beb9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/browser/directoryresource.py b/browser/directoryresource.py
@@ -58,6 +58,7 @@ class DirectoryResource(BrowserView, Resource):
         '.jpg':  ImageResourceFactory,
         '.pt':   PageTemplateResourceFactory,
         '.zpt':  PageTemplateResourceFactory,
+        '.html': PageTemplateResourceFactory,
         }
 
     default_factory = FileResourceFactory

diff --git a/browser/tests/test_directoryresource.py b/browser/tests/test_directoryresource.py
@@ -118,8 +118,6 @@ def testCorrectFactories(self):
         self.assert_(zapi.isinstance(image, FileResource))
         template = resource['test.pt']
         self.assert_(zapi.isinstance(template, PageTemplateResource))
-        file = resource['test.html']
-        self.assert_(zapi.isinstance(file, FileResource))
         file = resource['test.txt']
         self.assert_(zapi.isinstance(file, FileResource))
         file = resource['png']

diff --git a/browser/tests/testfiles/test.html b/browser/tests/testfiles/test.html