[Checkins] SVN: z3c.hashedresource/trunk/ remove temporary directory when tearing down functional tests, fixed some imports

[Thomas Lotze]

Log message for revision 101885:
  remove temporary directory when tearing down functional tests, fixed some imports

Changed:
  U   z3c.hashedresource/trunk/CHANGES.txt
  U   z3c.hashedresource/trunk/src/z3c/hashedresource/testing.py
  U   z3c.hashedresource/trunk/src/z3c/hashedresource/tests/test_url.py

-=-
Modified: z3c.hashedresource/trunk/CHANGES.txt
===================================================================
--- z3c.hashedresource/trunk/CHANGES.txt	2009-07-14 08:56:06 UTC (rev 101884)
+++ z3c.hashedresource/trunk/CHANGES.txt	2009-07-14 09:01:19 UTC (rev 101885)
@@ -8,7 +8,9 @@
 - Added compatibility with Zope2. The dependency on zope.app.publisher >= 3.8.2
   is not longer declared explicitly, but still required when using Zope3.
 
+- Some code and test clean-ups.
 
+
 1.0 (2009-06-16)
 ================
 

Modified: z3c.hashedresource/trunk/src/z3c/hashedresource/testing.py
===================================================================
--- z3c.hashedresource/trunk/src/z3c/hashedresource/testing.py	2009-07-14 08:56:06 UTC (rev 101884)
+++ z3c.hashedresource/trunk/src/z3c/hashedresource/testing.py	2009-07-14 09:01:19 UTC (rev 101885)
@@ -18,11 +18,13 @@
 from z3c.hashedresource import interfaces
 import os
 import re
+import shutil
 import tempfile
 import z3c.hashedresource.tests
 import zope.app.testing.functional
 import zope.publisher.browser
 import zope.security.checker
+import zope.site
 
 
 fixture = os.path.join(
@@ -64,5 +66,9 @@
             self.tmpdir, checker, self.dirname)(self.request)
         self.directory.__parent__ = self.site
 
+    def tearDown(self):
+        super(FunctionalTestCase, self).tearDown()
+        shutil.rmtree(self.tmpdir)
+
     def _hash(self, text):
         return re.match('http://127.0.0.1/\+\+noop\+\+([^/]*)/.*', text).group(1)

Modified: z3c.hashedresource/trunk/src/z3c/hashedresource/tests/test_url.py
===================================================================
--- z3c.hashedresource/trunk/src/z3c/hashedresource/tests/test_url.py	2009-07-14 08:56:06 UTC (rev 101884)
+++ z3c.hashedresource/trunk/src/z3c/hashedresource/tests/test_url.py	2009-07-14 09:01:19 UTC (rev 101885)
@@ -22,7 +22,6 @@
 import zope.app.publisher.browser.tests
 import zope.app.publisher.testing
 import zope.app.testing.functional
-import zope.site.hooks
 
 
 class HashingURLTest(testing.FunctionalTestCase):