Merge remote-tracking branch 'pixelated/remove-destructor' into develop

2 files changed, 0 insertions, 17 deletions

diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py
index ac9f8eb..2a5bac4 100644
--- a/src/leap/keymanager/__init__.py
+++ b/src/leap/keymanager/__init__.py
@@ -131,19 +131,6 @@ class KeyManager(object):
         self.refresher = None
 
     #
-    # destructor
-    #
-
-    def __del__(self):
-        try:
-            created_tmp_combined_ca_bundle = self._combined_ca_bundle not in \
-                [ca_bundle.where(), self._ca_cert_path]
-            if created_tmp_combined_ca_bundle:
-                os.remove(self._combined_ca_bundle)
-        except OSError:
-            pass
-
-    #
     # utilities
     #
 
diff --git a/tests/test_keymanager.py b/tests/test_keymanager.py
index 118cd8c..ae06372 100644
--- a/tests/test_keymanager.py
+++ b/tests/test_keymanager.py
@@ -20,7 +20,6 @@
 Tests for the Key Manager.
 """
 
-from os import path
 import json
 import urllib
 from datetime import datetime
@@ -496,9 +495,6 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
                 expected = self._slurp_file(ca_bundle.where()) + ca_content
                 self.assertEqual(expected, self._slurp_file(tmp_output.name))
 
-            del km  # force km out of scope
-            self.assertFalse(path.exists(tmp_output.name))
-
     def _dump_to_file(self, filename, content):
             with open(filename, 'w') as out:
                 out.write(content)