[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_ - import rfc1123_date directly from App.Common

[Yvo Schubbe]

Log message for revision 120678:
  - import rfc1123_date directly from App.Common

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/test_File.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_File.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_File.py	2011-03-02 15:48:00 UTC (rev 120677)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_File.py	2011-03-02 16:37:44 UTC (rev 120678)
@@ -15,17 +15,18 @@
 
 import unittest
 import Testing
-import transaction
-import DateTime
 
 from os.path import join as path_join
 
+import transaction
+from App.Common import rfc1123_date
 from zope.interface.verify import verifyClass
 from zope.testing.cleanup import cleanUp
 
 from Products.CMFCore.testing import ConformsToContent
 from Products.CMFCore.tests.base.dummy import DummyCachingManager
 from Products.CMFCore.tests.base.dummy import DummyCachingManagerWithPolicy
+from Products.CMFCore.tests.base.dummy import FAKE_ETAG
 from Products.CMFCore.tests.base.testcase import RequestTest
 from Products.CMFDefault import tests
 
@@ -113,10 +114,6 @@
     def test_index_html_with_304_from_cpm( self ):
         self._setupCachingPolicyManager(DummyCachingManagerWithPolicy())
         path, ref = self._extractFile()
-
-        from webdav.common import rfc1123_date
-        from Products.CMFCore.tests.base.dummy import FAKE_ETAG
-
         file = self._makeOne( 'test_file', 'test_file.swf', file=ref )
         file = file.__of__( self.root )
 
@@ -135,9 +132,6 @@
         # should behave the same as without cpm installed
         self._setupCachingPolicyManager(DummyCachingManager())
         path, ref = self._extractFile()
-
-        from webdav.common import rfc1123_date
-
         file = self._makeOne( 'test_file', 'test_file.swf', file=ref )
         file = file.__of__( self.root )
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py	2011-03-02 15:48:00 UTC (rev 120677)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py	2011-03-02 16:37:44 UTC (rev 120678)
@@ -22,6 +22,7 @@
 import transaction
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.User import UnrestrictedUser
+from App.Common import rfc1123_date
 from zope.interface.verify import verifyClass
 from zope.site.hooks import setSite
 from zope.testing.cleanup import cleanUp
@@ -31,11 +32,12 @@
 from Products.CMFCore.tests.base.dummy import DummyCachingManagerWithPolicy
 from Products.CMFCore.tests.base.dummy import DummySite
 from Products.CMFCore.tests.base.dummy import DummyTool
+from Products.CMFCore.tests.base.dummy import FAKE_ETAG
 from Products.CMFCore.tests.base.testcase import RequestTest
 from Products.CMFDefault import tests
 from Products.CMFDefault.testing import FunctionalLayer
 
-from test_File import LMDummyCachingManager
+from .test_File import LMDummyCachingManager
 
 TESTS_HOME = tests.__path__[0]
 TEST_JPG = path_join(TESTS_HOME, 'TestImage.jpg')
@@ -217,10 +219,6 @@
     def test_index_html_with_304_from_cpm( self ):
         self._setupCachingPolicyManager(DummyCachingManagerWithPolicy())
         path, ref = self._extractFile()
-
-        from webdav.common import rfc1123_date
-        from Products.CMFCore.tests.base.dummy import FAKE_ETAG
-
         self.root.file = self._makeOne('test_file', 'test_image.jpg', file=ref)
         file = self.root.file
 
@@ -256,9 +254,6 @@
     def test_index_html_200_with_cpm( self ):
         self._setupCachingPolicyManager(DummyCachingManagerWithPolicy())
         path, ref = self._extractFile()
-
-        from webdav.common import rfc1123_date
-
         file = self._makeOne( 'test_file', 'test_image.jpg', file=ref )
         file = file.__of__( self.root )
 
@@ -278,14 +273,10 @@
                         , rfc1123_date( mod_time ) )
 
     def test_index_html_with_304_and_caching( self ):
-
         # See collector #355
         self._setupCachingPolicyManager(DummyCachingManager())
         original_len = len(self.RESPONSE.headers)
         path, ref = self._extractFile()
-
-        from webdav.common import rfc1123_date
-
         self.root.image = self._makeOne( 'test_image', 'test_image.gif' )
         image = self.root.image
         transaction.savepoint(optimistic=True)