Skip to content

refactor: remove python 2 compat sys.version calls #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
afuetterer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: remove python 2 compat sys.version calls #469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 4 additions & 23 deletions tika/tika.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,12 +665,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)

Expand Down Expand Up @@ -706,17 +701,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)
Expand Down Expand Up @@ -920,12 +906,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]))
Expand Down