coredump: drop python 2 support

This patch reverts changes introduced for Python 2 compatibility
in commits:

  1c866db (Add new files for running criu-coredump via python 2 or 3)

  3180d35 (Add support for python3 in criu-coredump).

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>

Makefile

@@ -431,7 +431,7 @@ lint:
 	flake8 --config=scripts/flake8.cfg test/others/criu-ns/run.py
 	flake8 --config=scripts/flake8.cfg crit/setup.py
 	flake8 --config=scripts/flake8.cfg scripts/uninstall_module.py
-	flake8 --config=scripts/flake8.cfg coredump/
+	flake8 --config=scripts/flake8.cfg coredump/ coredump/coredump
 	shellcheck --version
 	shellcheck scripts/*.sh
 	shellcheck scripts/ci/*.sh scripts/ci/apt-install

coredump/coredump

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import argparse
 import os
 import sys

coredump/coredump-python2

@@ -1,6 +0,0 @@
-#!/usr/bin/env python2
-
-import coredump
-
-if __name__ == '__main__':
-    coredump.main()

coredump/coredump-python3

@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-
-import coredump
-
-if __name__ == '__main__':
-    coredump.main()

coredump/criu_coredump/coredump.py

@@ -35,12 +35,6 @@ import ctypes
 from pycriu import images
 from . import elf
 
-
-try:
-    from itertools import ifilter as filter
-except ImportError:
-    pass
-
 # Some memory-related constants
 PAGESIZE = 4096
 status = {
@@ -318,10 +312,7 @@ class coredump_generator:
         # prpsinfo.pr_psargs has a limit of 80 characters which means it will
         # fail here if the cmdline is longer than 80
         prpsinfo.pr_psargs = self._gen_cmdline(pid)[:80]
-        if (sys.version_info > (3, 0)):
-            prpsinfo.pr_fname = core["tc"]["comm"].encode()
-        else:
-            prpsinfo.pr_fname = core["tc"]["comm"]
+        prpsinfo.pr_fname = core["tc"]["comm"].encode()
 
         nhdr = elf.Elf64_Nhdr()
         nhdr.n_namesz = 5
@@ -581,10 +572,7 @@ class coredump_generator:
             setattr(data, "start" + str(i), info.start)
             setattr(data, "end" + str(i), info.end)
             setattr(data, "file_ofs" + str(i), info.file_ofs)
-            if (sys.version_info > (3, 0)):
-                setattr(data, "name" + str(i), info.name.encode())
-            else:
-                setattr(data, "name" + str(i), info.name)
+            setattr(data, "name" + str(i), info.name.encode())
 
         nhdr = elf.Elf64_Nhdr()
 

test/others/env.sh

@@ -13,5 +13,5 @@ fi
 #export PYTHON
 CRIT=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../crit/crit-"${PYTHON}")
 crit=$CRIT
-CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../coredump/coredump-"${PYTHON}")
+CRIU_COREDUMP=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../coredump/coredump)
 criu_coredump=$CRIU_COREDUMP