Merge pull request #1395 from onionshare/developv2.3.3

Version 2.3.3, merge develop into stable

1 files changed, 2 insertions, 22 deletions

diff --git a/cli/onionshare_cli/onionshare.py b/cli/onionshare_cli/onionshare.py
index 30eae3f3..bd94100f 100644
--- a/cli/onionshare_cli/onionshare.py
+++ b/cli/onionshare_cli/onionshare.py
@@ -18,9 +18,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import os, shutil
-
-from . import common
+import os
 from .common import AutoStopTimer
 
 
@@ -59,7 +57,7 @@ class OnionShare(object):
         """
         try:
             self.port = self.common.get_available_port(17600, 17650)
-        except:
+        except Exception:
             raise OSError("Cannot find an available OnionShare port")
 
     def start_onion_service(self, mode, mode_settings, await_publication=True):
@@ -90,21 +88,3 @@ class OnionShare(object):
         Stop the onion service
         """
         self.onion.stop_onion_service(mode_settings)
-
-    def cleanup(self):
-        """
-        Shut everything down and clean up temporary files, etc.
-        """
-        self.common.log("OnionShare", "cleanup")
-
-        # Cleanup files
-        try:
-            for filename in self.cleanup_filenames:
-                if os.path.isfile(filename):
-                    os.remove(filename)
-                elif os.path.isdir(filename):
-                    shutil.rmtree(filename)
-        except:
-            # Don't crash if file is still in use
-            pass
-        self.cleanup_filenames = []