Changeset 186

Timestamp:

02/28/07 15:52:34 (2 years ago)

Author:

mk

Message:

Fix shutil.rmtree issue on Windows (closes #49).

Files:

• trunk/cheesecake/cheesecake_index.py (modified) (3 diffs)
• trunk/cheesecake/util.py (modified) (2 diffs)
• trunk/tests/unit/_mockup_cheesecake.py (modified) (2 diffs)
• trunk/tests/unit/test_index_pylint.py (modified) (2 diffs)
• trunk/tests/unit/test_index_unit_tested.py (modified) (2 diffs)
• trunk/tests/unit/test_index_unittests.py (modified) (2 diffs)
• trunk/tests/unit/test_init_cleanup.py (modified) (2 diffs)

trunk/cheesecake/cheesecake_index.py

@@ -32 +32 @@
-from util import StdoutRedirector
-from util import time_function
+from util import rmtree
-from codeparser import CodeParser
-from __init__ import __version__ as VERSION
- 
+
-
-__docformat__ = 'reStructuredText en'
@@ -1397 +1398 @@
-            if os.path.isdir(dirname):
-                self.log("Removing directory %s" % dirname)
-shutil.
+
-
-        delete_dir(self.sandbox)
@@ -1626 +1627 @@
-        self.sandbox_pkg_dir = os.path.join(self.sandbox, self.package_name)
-        if os.path.isdir(self.sandbox_pkg_dir):
-shutil.
+
-
-        # Call appropriate function to unpack the package.

trunk/cheesecake/util.py

@@ -5 +5 @@
-import shutil
-import signal
+import stat
-import sys
-import tarfile
@@ -231 +232 @@
-    end = time.time()
-    return ret, end-start
+
+def rmtree(topdir):
+    """Remove the whole directory tree (including subdirectories).
+
+    Works around some Windows-specific behaviour of shutil.rmtree.
+    """
+    all_privileges = stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC
+
+    # Make all files and diretories writable.
+    os.chmod(topdir, all_privileges)
+    for root, dirnames, filenames in os.walk(topdir):
+        for name in dirnames + filenames:
+            try:
+                os.chmod(os.path.join(root, name), all_privileges)
+            except OSError:
+                pass
+
+    shutil.rmtree(topdir, ignore_errors=True)
+

trunk/tests/unit/_mockup_cheesecake.py

@@ -7 +7 @@
-from cheesecake.cheesecake_index import Cheesecake
-from cheesecake.cheesecake_index import CheesecakeIndex
+from cheesecake.util import rmtree
-
-from _helper_cheesecake import create_empty_files_in_directory
@@ -46 +47 @@
-
-    def tearDown(self):
-shutil.
+
-        os.unlink(self._mock_logfile)
-

trunk/tests/unit/test_index_pylint.py

@@ -6 +6 @@
-from _helper_cheesecake import DATA_PATH, Glutton, create_empty_file
-from cheesecake.cheesecake_index import IndexPyLint
+from cheesecake.util import rmtree
-from cheesecake import logger
-
@@ -47 +48 @@
-
-        # Clean up.
-shutil.
+

trunk/tests/unit/test_index_unit_tested.py

@@ -9 +9 @@
-from cheesecake.cheesecake_index import Cheesecake
-from cheesecake.cheesecake_index import IndexUnitTested
+from cheesecake.util import rmtree
-from cheesecake import logger
-
@@ -57 +58 @@
-    def tearDown(self):
-        if os.path.exists(self.sandbox_dir):
-shutil.
+
-
-    def test_doctest(self):

trunk/tests/unit/test_index_unittests.py

@@ -10 +10 @@
-from cheesecake.cheesecake_index import IndexUnitTests
-from cheesecake import logger
+from cheesecake.util import rmtree
-
-
@@ -35 +36 @@
-    def tearDown(self):
-        if os.path.exists(self.project_dir):
-shutil.
+
-
-    def test_unit_tests_index(self):

trunk/tests/unit/test_init_cleanup.py

@@ -6 +6 @@
-from _helper_cheesecake import DATA_PATH
-from cheesecake.cheesecake_index import Cheesecake
+from cheesecake.util import rmtree
-
-
@@ -12 +13 @@
-        if hasattr(self, 'cheesecake'):
-            if os.path.isdir(self.cheesecake.sandbox):
-shutil.
+
-        if hasattr(self, 'logfile'):
-            if os.path.isfile(self.logfile):