From: Zooko Date: Tue, 26 May 2015 17:20:11 +0000 (+0000) Subject: remove dead code: NamedTemporaryDirectory X-Git-Tag: allmydata-tahoe-1.10.1b1~15^2 X-Git-Url: https://git.rkrishnan.org/about.html?a=commitdiff_plain;h=a9b152780e3c4d875100853477a006edf49964ec;p=tahoe-lafs%2Ftahoe-lafs.git remove dead code: NamedTemporaryDirectory fixes #2433 --- diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index a2bba112..db64bf19 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -431,18 +431,6 @@ class FileUtil(ReallyEqualMixin, unittest.TestCase): 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): basedir = "util/FileUtil/test_rename" fileutil.make_dirs(basedir) diff --git a/src/allmydata/util/fileutil.py b/src/allmydata/util/fileutil.py index 20f5c34e..a2c3841f 100644 --- a/src/allmydata/util/fileutil.py +++ b/src/allmydata/util/fileutil.py @@ -87,34 +87,6 @@ class ReopenableNamedTemporaryFile: 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: # not implemented: next, readline, readlines, xreadlines, writelines