Remove Jython compat

Jython is stuck in Python 2-land. Remove Jython compatibility code.

Bug: https://bugs.gentoo.org/424259
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
Closes: https://github.com/gentoo/portage/pull/942
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 8 insertions, 32 deletions

diff --git a/bin/ebuild b/bin/ebuild
index ff2b4fe92..5368d030b 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import argparse
-import platform
 import signal
 import sys
 import textwrap
@@ -32,12 +31,7 @@ def debug_signal(_signum, _frame):
     pdb.set_trace()
 
 
-if platform.python_implementation() == "Jython":
-    debug_signum = signal.SIGUSR2  # bug #424259
-else:
-    debug_signum = signal.SIGUSR1
-
-signal.signal(debug_signum, debug_signal)
+signal.signal(signal.SIGUSR1, debug_signal)
 
 import io
 import os
diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py
index bc5dda27d..c0b24c542 100755
--- a/bin/ebuild-ipc.py
+++ b/bin/ebuild-ipc.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright 2010-2021 Gentoo Authors
+# Copyright 2010-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # This is a helper which ebuild processes can use
@@ -24,7 +24,6 @@ except KeyboardInterrupt:
 import errno
 import logging
 import pickle
-import platform
 import sys
 import time
 
@@ -35,12 +34,7 @@ def debug_signal(signum, frame):
     pdb.set_trace()
 
 
-if platform.python_implementation() == "Jython":
-    debug_signum = signal.SIGUSR2  # bug #424259
-else:
-    debug_signum = signal.SIGUSR1
-
-signal.signal(debug_signum, debug_signal)
+signal.signal(signal.SIGUSR1, debug_signal)
 
 if os.path.isfile(
     os.path.join(
diff --git a/bin/egencache b/bin/egencache
index 4d920ea3b..f5e7fb7b6 100755
--- a/bin/egencache
+++ b/bin/egencache
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
-# Copyright 2009-2021 Gentoo Authors
+# Copyright 2009-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import argparse
-import platform
 import signal
 import stat
 import sys
@@ -29,12 +28,7 @@ def debug_signal(_signum, _frame):
     pdb.set_trace()
 
 
-if platform.python_implementation() == "Jython":
-    debug_signum = signal.SIGUSR2  # bug #424259
-else:
-    debug_signum = signal.SIGUSR1
-
-signal.signal(debug_signum, debug_signal)
+signal.signal(signal.SIGUSR1, debug_signal)
 
 import functools
 import io
diff --git a/bin/emerge b/bin/emerge
index d1a8d9f52..459db2c1f 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
-# Copyright 2006-2021 Gentoo Authors
+# Copyright 2006-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-import platform
 import signal
 import sys
 
@@ -28,12 +27,7 @@ try:
 
         pdb.set_trace()
 
-    if platform.python_implementation() == "Jython":
-        debug_signum = signal.SIGUSR2  # bug #424259
-    else:
-        debug_signum = signal.SIGUSR1
-
-    signal.signal(debug_signum, debug_signal)
+    signal.signal(signal.SIGUSR1, debug_signal)
 
     from os import path as osp