From 46a7e542a1a4febd8fa9c8ceeecb43184074f79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristj=C3=A1n=20Valur=20J=C3=B3nsson?= <sweskman@gmail.com>
Date: Mon, 19 Apr 2021 15:51:50 +0000
Subject: [PATCH] Fix encoding, for python3

---
 coredump_uploader/__init__.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/coredump_uploader/__init__.py b/coredump_uploader/__init__.py
index de9f638..6ceaf4c 100644
--- a/coredump_uploader/__init__.py
+++ b/coredump_uploader/__init__.py
@@ -198,6 +198,7 @@ _thread_re = re.compile(
 
 
 def code_id_to_debug_id(code_id):
+    code_id += "00"*16
     return str(uuid.UUID(bytes_le=binascii.unhexlify(code_id)[:16]))
 
 
@@ -382,7 +383,7 @@ class CoredumpUploader(object):
         except OSError as err:
             error(err)
 
-        output, errors = process.communicate(input=gdb_command)
+        output, errors = process.communicate(input=gdb_command.encode("utf-8"))
         if errors:
             error(errors)
 
@@ -475,6 +476,7 @@ class CoredumpUploader(object):
             stdin=subprocess.PIPE,
         )
         elfutils_version, err = process.communicate()
+        elfutils_version = elfutils_version.decode("utf-8")
         if err:
             print(err)
 
@@ -488,6 +490,7 @@ class CoredumpUploader(object):
             ["uname", "-s", "-r"], stdout=subprocess.PIPE, stdin=subprocess.PIPE,
         )
         os_context, err = process.communicate()
+        os_context = os_context.decode("utf-8")
         os_context = re.search(r"(?P<name>.*?) (?P<version>.*)", os_context)
         if os_context:
             os_name = os_context.group("name")
@@ -499,12 +502,15 @@ class CoredumpUploader(object):
             ["uname", "-a"], stdout=subprocess.PIPE, stdin=subprocess.PIPE,
         )
         os_raw_context, err = process.communicate()
+        os_raw_context = os_raw_context.decode("utf-8")
 
         # Get App Contex
         process = subprocess.Popen(
             ["file", path_to_core], stdout=subprocess.PIPE, stdin=subprocess.PIPE,
         )
+        args = app_name = arch = ""
         app_context, err = process.communicate()
+        app_context = app_context.decode("utf-8")
         app_context = re.search(
             r"from '.*?( (?P<args>.*))?', .* execfn: '.*\/(?P<app_name>.*?)', platform: '(?P<arch>.*?)'",
             app_context,