Merge pull request #791 from ngosang/feature/clean3

code cleanup: bazarr

bazarr.py

@@ -1,38 +1,32 @@
 # coding=utf-8
 
-from __future__ import absolute_import
-from __future__ import print_function
-
-import bazarr.libs
-from six import PY3
-import subprocess as sp
-import time
 import os
-import sys
 import platform
-import re
 import signal
+import subprocess
+import sys
+import time
 
 from bazarr.get_args import args
+from libs.six import PY3
 
 
 def check_python_version():
     python_version = platform.python_version_tuple()
-    minimum_python_version_tuple = (2, 7, 13)
+    minimum_py2_tuple = (2, 7, 13)
-    minimum_python3_version_tuple = (3, 6, 0)
+    minimum_py3_tuple = (3, 6, 0)
-    minimum_python_version = ".".join(str(i) for i in minimum_python_version_tuple)
+    minimum_py2_str = ".".join(str(i) for i in minimum_py2_tuple)
-    minimum_python3_version = ".".join(str(i) for i in minimum_python3_version_tuple)
+    minimum_py3_str = ".".join(str(i) for i in minimum_py3_tuple)
-
+
-    if int(python_version[0]) == minimum_python3_version_tuple[0]:
+    if (int(python_version[0]) == minimum_py3_tuple[0] and int(python_version[1]) < minimum_py3_tuple[1]) or \
-        if int(python_version[1]) >= minimum_python3_version_tuple[1]:
+            (int(python_version[0]) != minimum_py3_tuple[0] and int(python_version[0]) != minimum_py2_tuple[0]):
-            pass
+        print("Python " + minimum_py3_str + " or greater required. "
-        else:
+              "Current version is " + platform.python_version() + ". Please upgrade Python.")
-            print("Python " + minimum_python3_version + " or greater required. Current version is " + platform.python_version() + ". Please upgrade Python.")
+        sys.exit(1)
-            os._exit(0)
+    elif int(python_version[0]) == minimum_py2_tuple[0] and int(python_version[1]) < minimum_py2_tuple[1]:
-
+        print("Python " + minimum_py2_str + " or greater required. "
-    elif int(python_version[1]) < minimum_python_version_tuple[1] or int(re.search(r'\d+', python_version[2]).group()) < minimum_python_version_tuple[2]:
+              "Current version is " + platform.python_version() + ". Please upgrade Python.")
-        print("Python " + minimum_python_version + " or greater required. Current version is " + platform.python_version() + ". Please upgrade Python.")
+        sys.exit(1)
-        os._exit(0)
 
 
 check_python_version()
@@ -61,11 +55,11 @@ class DaemonStatus(ProcessRegistry):
     def unregister(self, process):
         self.__processes.remove(process)
 
-    '''
-    Waits all the provided processes for the specified amount of time in seconds.
-    '''
     @staticmethod
     def __wait_for_processes(processes, timeout):
+        """
+        Waits all the provided processes for the specified amount of time in seconds.
+        """
         reference_ts = time.time()
         elapsed = 0
         remaining_processes = list(processes)
@@ -80,22 +74,21 @@ class DaemonStatus(ProcessRegistry):
                             try:
                                 ep.wait(remaining_time)
                                 remaining_processes.remove(ep)
-                            except sp.TimeoutExpired:
+                            except subprocess.TimeoutExpired:
                                 pass
                         else:
-                            '''
+                            # In python 2 there is no such thing as some mechanism to wait with a timeout
-                            In python 2 there is no such thing as some mechanism to wait with a timeout.
-                            '''
                             time.sleep(1)
                         elapsed = time.time() - reference_ts
                         remaining_time = timeout - elapsed
         return remaining_processes
 
-    '''
-    Sends to every single of the specified processes the given signal and (if live_processes is not None) append to it processes which are still alive.
-    '''
     @staticmethod
     def __send_signal(processes, signal_no, live_processes=None):
+        """
+        Sends to every single of the specified processes the given signal and (if live_processes is not None) append to
+        it processes which are still alive.
+        """
         for ep in processes:
             if ep.poll() is None:
                 if live_processes is not None:
@@ -103,13 +96,14 @@ class DaemonStatus(ProcessRegistry):
                 try:
                     ep.send_signal(signal_no)
                 except Exception as e:
-                    print('Failed sending signal %s to process %s because of an unexpected error: %s' % (signal_no, ep.pid, e))
+                    print('Failed sending signal %s to process %s because of an unexpected error: %s' % (
+                        signal_no, ep.pid, e))
         return live_processes
 
-    '''
-    Flags this instance as should stop and terminates as smoothly as possible children processes.
-    '''
     def stop(self):
+        """
+        Flags this instance as should stop and terminates as smoothly as possible children processes.
+        """
         self.__should_stop = True
         live_processes = DaemonStatus.__send_signal(self.__processes, signal.SIGINT, list())
         live_processes = DaemonStatus.__wait_for_processes(live_processes, 120)
@@ -122,7 +116,7 @@ class DaemonStatus(ProcessRegistry):
 def start_bazarr(process_registry=ProcessRegistry()):
     script = [sys.executable, "-u", os.path.normcase(os.path.join(dir_name, 'bazarr', 'main.py'))] + sys.argv[1:]
 
-    ep = sp.Popen(script, stdout=sp.PIPE, stderr=sp.STDOUT, stdin=sp.PIPE)
+    ep = subprocess.Popen(script, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE)
     process_registry.register(ep)
     print("Bazarr starting...")
     try:
@@ -147,12 +141,12 @@ if __name__ == '__main__':
 
     try:
         os.remove(restartfile)
-    except:
+    except Exception:
         pass
 
     try:
         os.remove(stopfile)
-    except:
+    except Exception:
         pass
 
 
@@ -160,16 +154,16 @@ if __name__ == '__main__':
         if os.path.exists(stopfile):
             try:
                 os.remove(stopfile)
-            except:
+            except Exception:
                 print('Unable to delete stop file.')
             else:
                 print('Bazarr exited.')
-                os._exit(0)
+                sys.exit(0)
 
         if os.path.exists(restartfile):
             try:
                 os.remove(restartfile)
-            except:
+            except Exception:
                 print('Unable to delete restart file.')
             else:
                 bazarr_runner()

libs/__init__.py

@@ -0,0 +1 @@
+# coding=utf-8