Changeset a9b1527 in trunk

Timestamp:

2015-05-26T17:20:11Z (10 years ago)

Author:

Zooko <zookog@…>

Branches:

master

Children:

b560246

Parents:

61e2ae4

Message:

remove dead code: NamedTemporaryDirectory?

fixes #2433

Location:

src/allmydata

Files:

• test/test_util.py (modified) (1 diff)
• util/fileutil.py (modified) (1 diff)

src/allmydata/test/test_util.py ¶

@@ -431 +431 @@
         fileutil.write_atomically(fn, "two", mode="") # non-binary
         self.failUnlessEqual(fileutil.read(fn), "two")
-
-    def test_NamedTemporaryDirectory(self):
-        basedir = "util/FileUtil/test_NamedTemporaryDirectory"
-        fileutil.make_dirs(basedir)
-        td = fileutil.NamedTemporaryDirectory(dir=basedir)
-        name = td.name
-        self.failUnless(basedir in name)
-        self.failUnless(basedir in repr(td))
-        self.failUnless(os.path.isdir(name))
-        del td
-        # it is conceivable that we need to force gc here, but I'm not sure
-        self.failIf(os.path.isdir(name))
 
     def test_rename(self):

src/allmydata/util/fileutil.py ¶

@@ -87 +87 @@
     def shutdown(self):
         remove(self.name)
-
-class NamedTemporaryDirectory:
-    """
-    This calls tempfile.mkdtemp(), stores the name of the dir in
-    self.name, and rmrf's the dir when it gets garbage collected or
-    "shutdown()".
-    """
-    def __init__(self, cleanup=True, *args, **kwargs):
-        """ If cleanup, then the directory will be rmrf'ed when the object is shutdown. """
-        self.cleanup = cleanup
-        self.name = tempfile.mkdtemp(*args, **kwargs)
-
-    def __repr__(self):
-        return "<%s instance at %x %s>" % (self.__class__.__name__, id(self), self.name)
-
-    def __str__(self):
-        return self.__repr__()
-
-    def __del__(self):
-        try:
-            self.shutdown()
-        except:
-            import traceback
-            traceback.print_exc()
-
-    def shutdown(self):
-        if self.cleanup and hasattr(self, 'name'):
-            rm_dir(self.name)
 
 class EncryptedTemporaryFile: