Removed old gui code references and variables

py-kms/pykms_Client.py

@@ -45,10 +45,9 @@ class client_thread(threading.Thread):
         def __init__(self, name):
                 threading.Thread.__init__(self)
                 self.name = name
-                self.with_gui = False
 
         def run(self):
-                clt_main(with_gui = self.with_gui)
+                clt_main()
 
 #---------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -297,11 +296,10 @@ def client_create(clt_sock):
                 pretty_printer(log_obj = loggerclt.warning, to_exit = True, where = "clt",
                                put_text = "{reverse}{magenta}{bold}Something went wrong. Exiting...{end}")
 
-def clt_main(with_gui = False):
+def clt_main():
         try:
-                if not with_gui:
-                        # Parse options.
-                        client_options()
+                # Parse options.
+                client_options()
 
                 # Check options.
                 client_check()
@@ -393,4 +391,4 @@ def readKmsResponseV6(data):
         return message
 
 if __name__ == "__main__":
-        clt_main(with_gui = False)
+        clt_main()

py-kms/pykms_Format.py

@@ -400,7 +400,6 @@ def pretty_printer(**kwargs):
                                    if None `put_text` must be defined for printing process.
                     `to_exit ` --> if True system exit is called.
                     `where`    --> specifies if message is server-side or client-side
-                                   (useful for GUI redirect).
         """
         # Set defaults for not defined options.
         options = {'log_obj'  : None,

py-kms/pykms_Misc.py

@@ -194,9 +194,6 @@ def logger_create(log_obj, config, mode = 'a'):
         frmt_name = '%(name)s '
 
         from pykms_Server import serverthread
-        if serverthread.with_gui:
-                frmt_std = frmt_name + frmt_std
-                frmt_min = frmt_name + frmt_min
 
         def apply_formatter(levelnum, formats, handler, color = False):
                 levelformdict = {}
@@ -521,7 +518,7 @@ def check_setup(config, options, logger, where):
         # Check logfile.
         config['logfile'] = check_logfile(config['logfile'], options['lfile']['def'], where = where)
 
-        # Check logsize (py-kms Gui).
+        # Check logsize
         if config['logsize'] == "":
                 if any(opt in ['STDOUT', 'FILEOFF'] for opt in config['logfile']):
                         # set a recognized size never used.
@@ -530,7 +527,7 @@ def check_setup(config, options, logger, where):
                         pretty_printer(put_text = "{reverse}{red}{bold}argument `-S/--logsize`: invalid with: '%s'. Exiting...{end}" %config['logsize'],
                                        where = where, to_exit = True)
 
-        # Check loglevel (py-kms Gui).
+        # Check loglevel
         if config['loglevel'] == "":
                 # set a recognized level never used.
                 config['loglevel'] = 'ERROR'

py-kms/pykms_Server.py

@@ -134,7 +134,8 @@ class server_thread(threading.Thread):
                 self.name = name
                 self.queue = queue
                 self.server = None
-                self.is_running_server, self.with_gui, self.checked = [False for _ in range(3)]
+                self.is_running_server = False
+                self.checked = False
                 self.is_running_thread = threading.Event()
 
         def terminate_serve(self):
@@ -169,13 +170,7 @@ class server_thread(threading.Thread):
                                                 self.server.pykms_serve()
                                 except (SystemExit, Exception) as e:
                                         self.eject = True
-                                        if not self.with_gui:
-                                                raise
-                                        else:
-                                                if isinstance(e, SystemExit):
-                                                        continue
-                                                else:
-                                                        raise
+                                        raise
 
 ##---------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -385,9 +380,6 @@ def server_check():
         opts = [('clientcount', '-c/--client-count'),
                 ('timeoutidle', '-t0/--timeout-idle'),
                 ('timeoutsndrcv', '-t1/--timeout-sndrcv')]
-        if serverthread.with_gui:
-                opts += [('activation', '-a/--activation-interval'),
-                         ('renewal', '-r/--renewal-interval')]
         check_other(srv_config, opts, loggersrv, where = 'srv')
 
         # Check further addresses / ports.
@@ -467,7 +459,6 @@ def server_main_terminal():
         server_check()
         serverthread.checked = True
 
-        # (without GUI) and (without daemon).
         # Run threaded server.
         serverqueue.put('start')
         # Wait to finish.