factor PyInstaller test to toolbox; exception catch-all

Author: thorstenkampe

sql shell.exe

@@ -1,8 +1,8 @@
 #! /usr/bin/env python
 
 import configparser, curses, os, pathlib, subprocess, sys
-import click, pycompat, sshtunnel
-import tunnel
+import click, pycompat
+import toolbox as tb, tunnel
 # https://npyscreen.readthedocs.io/
 from npyscreen import *  # NOSONAR
 
@@ -54,8 +54,8 @@
 config = configparser.ConfigParser(delimiters='=')
 
 def read_config():
-    if getattr(sys, 'frozen', False):  # PyInstaller
-        # https://pyinstaller.readthedocs.io/en/stable/runtime-information.html
+    if tb.is_pyinstaller():
+        # https://pyinstaller.readthedocs.io/en/stable/runtime-information.html#using-sys-executable-and-sys-argv-0
         script_dir = sys.executable
     else:
         script_dir = __file__
@@ -297,8 +297,7 @@ def on_ok(self):  # NOSONAR
         except KeyboardInterrupt:
             pass
 
-        except (FileNotFoundError, ValueError, sshtunnel.BaseSSHTunnelForwarderError,
-                Exception) as exception:
+        except Exception as exception:
             print(exception)
 
         print()

sql shell.py

@@ -0,0 +1,5 @@
+import sys
+
+# https://pyinstaller.readthedocs.io/en/stable/runtime-information.html
+def is_pyinstaller():
+    return getattr(sys, 'frozen', False)

toolbox.py

@@ -2,6 +2,7 @@
 
 import configparser, getpass, logging, pathlib, sys
 import sshtunnel
+import toolbox as tb
 
 ini_file = 'tunnel.ini'
 defaults = {
@@ -27,7 +28,7 @@ def __exit__(self, *args):  # for `with tunnel:`
         pass
 
 def tunnel(remote_host, remote_port, local_port=0):  # `0` means random port
-    if getattr(sys, 'frozen', False):  # PyInstaller
+    if tb.is_pyinstaller():
         # https://pyinstaller.readthedocs.io/en/stable/runtime-information.html
         script_dir = sys.executable
     else: