Clean up tests.

Author: mmulqueen

tests/test_via_gnumeric.py

@@ -4,27 +4,13 @@
 import os
 import subprocess
 import csv
-import shutil
 
 import decimal
 import datetime
 
 import odswriter as ods
 
 
-class TempDir(object):
-    """
-        A simple context manager for temporary directories.
-    """
-
-    def __init__(self):
-        self.path = tempfile.mkdtemp()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args, **kwargs):
-        shutil.rmtree(self.path)
 
 
 def command_is_executable(args):
@@ -40,10 +26,10 @@ def launder_through_gnumeric(rows):
         Saves rows into an ods, uses ssconvert (based on gnumeric) to convert to a CSV and loads
         the rows from that CSV.
     """
-    with TempDir() as d:
+    with tempfile.TemporaryDirectory() as temp_dir:
         # Make an ODS
-        temp_ods = os.path.join(d.path, "test.ods")
-        temp_csv = os.path.join(d.path, "test.csv")
+        temp_ods = os.path.join(temp_dir, "test.ods")
+        temp_csv = os.path.join(temp_dir, "test.csv")
         with open(temp_ods, "wb") as temp_ods_file:
             with ods.writer(temp_ods_file) as odsfile:
                 odsfile.writerows(rows)

tests/test_via_libreoffice.py

@@ -4,26 +4,12 @@
 import os
 import subprocess
 import csv
-import shutil
 
 import decimal
 import datetime
 
 import odswriter as ods
 
-class TempDir(object):
-    """
-        A simple context manager for temporary directories.
-    """
-
-    def __init__(self):
-        self.path = tempfile.mkdtemp()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args, **kwargs):
-        shutil.rmtree(self.path)
 
 def command_is_executable(args):
     try:
@@ -37,22 +23,22 @@ def launder_through_lo(rows):
         Saves rows into an ods, uses LibreOffice to convert to a CSV and loads
         the rows from that CSV.
     """
-    with TempDir() as d:
+    with tempfile.TemporaryDirectory() as temp_dir:
         # Make an ODS
-        temp_ods = os.path.join(d.path, "test.ods")
+        temp_ods = os.path.join(temp_dir, "test.ods")
         with open(temp_ods, "wb") as temp_ods_file:
             with ods.writer(temp_ods_file) as odsfile:
                 odsfile.writerows(rows)
 
         # Convert it to a CSV
         p = subprocess.Popen(["libreoffice", "--headless", "--convert-to",
                               "csv", "test.ods"],
-                             cwd=d.path)
+                             cwd=temp_dir)
 
         p.wait()
 
         # Read the CSV
-        temp_csv = os.path.join(d.path,"test.csv")
+        temp_csv = os.path.join(temp_dir, "test.csv")
         with open(temp_csv) as temp_csv_file:
             csvfile = csv.reader(temp_csv_file)
             return list(csvfile)