Merge pull request chrismattmann#469 from afuetterer/sys-version

refactor: remove python 2 compat sys.version calls

Author: chrismattmann

tika/tika.py

@@ -663,12 +663,7 @@ def startServer(tikaServerJar, java_path = TikaJava, java_args = TikaJavaArgs, s
     global TikaServerProcess
     # Patch for Windows support
     if Windows:
-        if sys.version.startswith("2"):
-            # Python 2.x
-            TikaServerProcess = Popen(cmd_string, stdout=logFile, stderr=STDOUT, shell=True)
-        elif sys.version.startswith("3"):
-            # Python 3.x
-            TikaServerProcess = Popen(cmd_string, stdout=logFile, stderr=STDOUT, shell=True, start_new_session=True)
+        TikaServerProcess = Popen(cmd_string, stdout=logFile, stderr=STDOUT, shell=True, start_new_session=True)
     else:
         TikaServerProcess = Popen(cmd_string, stdout=logFile, stderr=STDOUT, shell=True, preexec_fn=os.setsid)
 
@@ -704,17 +699,8 @@ def killServer():
         time.sleep(1)
         # patch to support subprocess killing for windows
         if Windows:
-            if sys.version.startswith("2"):
-                # Python 2.x
-                PROCESS_TERMINATE = 1
-                handle = ctypes.windll.kernel32.OpenProcess(PROCESS_TERMINATE, False, TikaServerProcess.pid)
-                ctypes.windll.kernel32.TerminateProcess(handle, -1)
-                ctypes.windll.kernel32.CloseHandle(handle)
-                time.sleep(1)
-            elif sys.version.startswith("3"):
-                # Python 3.x
-                os.kill(TikaServerProcess.pid, signal.SIGTERM)
-                time.sleep(1)
+            os.kill(TikaServerProcess.pid, signal.SIGTERM)
+            time.sleep(1)
         else:
             try:
                 os.killpg(os.getpgid(TikaServerProcess.pid), signal.SIGTERM)
@@ -918,12 +904,7 @@ def main(argv=None):
     resp = main(sys.argv)
 
     # Set encoding of the terminal to UTF-8
-    if sys.version.startswith("2"):
-        # Python 2.x
-        out = codecs.getwriter("UTF-8")(sys.stdout)
-    elif sys.version.startswith("3"):
-        # Python 3.x
-        out = codecs.getwriter("UTF-8")(sys.stdout.buffer)
+    out = codecs.getwriter("UTF-8")(sys.stdout.buffer)
 
     if type(resp) == list:
         out.write('\n'.join([r[1] for r in resp]))