From 460c4d26972ecf57d5fe9c5bbbc0ed2ded9b8bf2 Mon Sep 17 00:00:00 2001
From: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date: Thu, 22 Jun 2023 03:53:03 +0100
Subject: [PATCH] lib/py: drop python 2 compatibility

This patch removes code introduced for compatibility with
Python 2 in commits:

  bf80fee (lib: correctly handle stdin/stdout (Python 3))

  b82f222 (lib: fix crit-recode fix for Python 2)

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
---
 lib/py/cli.py            |  4 ----
 lib/py/images/images.py  | 11 ++---------
 lib/py/images/pb2dict.py | 11 ++---------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/lib/py/cli.py b/lib/py/cli.py
index 221f7be0d..594035d27 100755
--- a/lib/py/cli.py
+++ b/lib/py/cli.py
@@ -11,8 +11,6 @@ def inf(opts):
     if opts['in']:
         return open(opts['in'], 'rb')
     else:
-        if (sys.version_info < (3, 0)):
-            return sys.stdin
         if sys.stdin.isatty():
             # If we are reading from a terminal (not a pipe) we want text input and not binary
             return sys.stdin
@@ -28,8 +26,6 @@ def outf(opts, decode):
             mode = 'w+'
         return open(opts['out'], mode)
     else:
-        if (sys.version_info < (3, 0)):
-            return sys.stdout
         if decode:
             return sys.stdout
         return sys.stdout.buffer
diff --git a/lib/py/images/images.py b/lib/py/images/images.py
index a1d76e7cf..9db506e1e 100644
--- a/lib/py/images/images.py
+++ b/lib/py/images/images.py
@@ -42,7 +42,6 @@ import base64
 import struct
 import os
 import array
-import sys
 
 from . import magic
 from . import pb
@@ -71,18 +70,12 @@ class MagicException(Exception):
 
 def decode_base64_data(data):
     """A helper function to decode base64 data."""
-    if (sys.version_info > (3, 0)):
-        return base64.decodebytes(str.encode(data))
-    else:
-        return base64.decodebytes(data)
+    return base64.decodebytes(str.encode(data))
 
 
 def write_base64_data(f, data):
     """A helper function to write base64 encoded data to a file."""
-    if (sys.version_info > (3, 0)):
-        f.write(base64.decodebytes(str.encode(data)))
-    else:
-        f.write(base64.decodebytes(data))
+    f.write(base64.decodebytes(str.encode(data)))
 
 
 # Generic class to handle loading/dumping criu images entries from/to bin
diff --git a/lib/py/images/pb2dict.py b/lib/py/images/pb2dict.py
index 9d581c375..c7046429e 100644
--- a/lib/py/images/pb2dict.py
+++ b/lib/py/images/pb2dict.py
@@ -3,7 +3,6 @@ import collections
 import os
 import quopri
 import socket
-import sys
 from ipaddress import IPv4Address, IPv6Address, ip_address
 
 from google.protobuf.descriptor import FieldDescriptor as FD
@@ -247,17 +246,11 @@ def encode_dev(field, value):
 
 
 def encode_base64(value):
-    if (sys.version_info > (3, 0)):
-        return base64.encodebytes(value).decode()
-    else:
-        return base64.encodebytes(value)
+    return base64.encodebytes(value).decode()
 
 
 def decode_base64(value):
-    if (sys.version_info > (3, 0)):
-        return base64.decodebytes(str.encode(value))
-    else:
-        return base64.decodebytes(value)
+    return base64.decodebytes(str.encode(value))
 
 
 def encode_unix(value):