From 326c9c932299f4ec7d1ddae5dd54384823e5da90 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Mon, 25 Aug 2014 18:24:59 +0100 Subject: [PATCH] fileutil cleanup: delete the unused open_or_create function. Signed-off-by: Daira Hopwood --- src/allmydata/test/test_util.py | 16 ---------------- src/allmydata/util/fileutil.py | 6 ------ 2 files changed, 22 deletions(-) diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index 2a5ba199..20f157b9 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -429,22 +429,6 @@ class FileUtil(unittest.TestCase): fileutil.write_atomically(fn, "two", mode="") # non-binary self.failUnlessEqual(fileutil.read(fn), "two") - def test_open_or_create(self): - basedir = "util/FileUtil/test_open_or_create" - fileutil.make_dirs(basedir) - fn = os.path.join(basedir, "here") - f = fileutil.open_or_create(fn) - f.write("stuff.") - f.close() - f = fileutil.open_or_create(fn) - f.seek(0, os.SEEK_END) - f.write("more.") - f.close() - f = open(fn, "r") - data = f.read() - f.close() - self.failUnlessEqual(data, "stuff.more.") - def test_NamedTemporaryDirectory(self): basedir = "util/FileUtil/test_NamedTemporaryDirectory" fileutil.make_dirs(basedir) diff --git a/src/allmydata/util/fileutil.py b/src/allmydata/util/fileutil.py index 8eb8e9fb..9446a3f6 100644 --- a/src/allmydata/util/fileutil.py +++ b/src/allmydata/util/fileutil.py @@ -224,12 +224,6 @@ def remove_if_possible(f): except: pass -def open_or_create(fname, binarymode=True): - try: - return open(fname, binarymode and "r+b" or "r+") - except EnvironmentError: - return open(fname, binarymode and "w+b" or "w+") - def du(basedir): size = 0 -- 2.45.2