aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2022-02-13 10:40:55 -0800
committerMicah Lee <micah@micahflee.com>2022-02-13 10:40:55 -0800
commit305abff13c8bb72e52c8e0268aa2e5efcf00a6d1 (patch)
treed90ed326fd77e2a5acc909c7872b2ca39c4d9a8a
parent33fd639f2ad844031ef664107ec13d234fd7b6b2 (diff)
downloadonionshare-305abff13c8bb72e52c8e0268aa2e5efcf00a6d1.tar.gz
onionshare-305abff13c8bb72e52c8e0268aa2e5efcf00a6d1.zip
Remove cleanup_tempfiles altogether because they are not being used
-rw-r--r--cli/onionshare_cli/web/send_base_mode.py3
-rw-r--r--cli/onionshare_cli/web/web.py6
-rw-r--r--cli/tests/test_cli_web.py4
3 files changed, 0 insertions, 13 deletions
diff --git a/cli/onionshare_cli/web/send_base_mode.py b/cli/onionshare_cli/web/send_base_mode.py
index 2e906081..d690c98d 100644
--- a/cli/onionshare_cli/web/send_base_mode.py
+++ b/cli/onionshare_cli/web/send_base_mode.py
@@ -201,9 +201,6 @@ class SendBaseModeWeb:
self._gzip_compress(filesystem_path, gzip_filename, 6, None)
self.gzip_individual_files[filesystem_path] = gzip_filename
- # Cleanup this temp file
- self.web.cleanup_tempfiles.append(gzip_filename)
-
file_to_download = self.gzip_individual_files[filesystem_path]
filesize = os.path.getsize(self.gzip_individual_files[filesystem_path])
else:
diff --git a/cli/onionshare_cli/web/web.py b/cli/onionshare_cli/web/web.py
index 64844b5c..fdbed567 100644
--- a/cli/onionshare_cli/web/web.py
+++ b/cli/onionshare_cli/web/web.py
@@ -171,7 +171,6 @@ class Web:
self.socketio.init_app(self.app)
self.chat_mode = ChatModeWeb(self.common, self)
- self.cleanup_tempfiles = []
self.cleanup_tempdirs = []
def get_mode(self):
@@ -405,13 +404,8 @@ class Web:
"""
self.common.log("Web", "cleanup")
- # Close all of the tempfile.NamedTemporaryFile
- for file in self.cleanup_tempfiles:
- file.close()
-
# Clean up the tempfile.NamedTemporaryDirectory objects
for dir in self.cleanup_tempdirs:
dir.cleanup()
- self.cleanup_tempfiles = []
self.cleanup_tempdirs = []
diff --git a/cli/tests/test_cli_web.py b/cli/tests/test_cli_web.py
index f6076ef9..aa5d06a7 100644
--- a/cli/tests/test_cli_web.py
+++ b/cli/tests/test_cli_web.py
@@ -308,17 +308,13 @@ class TestWeb:
def test_cleanup(self, common_obj, temp_dir_1024):
web = web_obj(temp_dir_1024, common_obj, "share", 3)
- temp_file = tempfile.NamedTemporaryFile()
temp_dir = tempfile.TemporaryDirectory()
- web.cleanup_tempfiles = [temp_file]
web.cleanup_tempdirs = [temp_dir]
web.cleanup()
- assert os.path.exists(temp_file.name) is False
assert os.path.exists(temp_dir.name) is False
- assert web.cleanup_tempfiles == []
assert web.cleanup_tempdirs == []