|
 |
66b169c |
From ed7aaffdcac4f29cd513cd4c1086339512320a1c Mon Sep 17 00:00:00 2001
|
|
|
66b169c |
From: Jakub Filak <jfilak@redhat.com>
|
|
|
66b169c |
Date: Fri, 24 Jul 2015 13:47:15 +0200
|
|
|
66b169c |
Subject: [PATCH] pass encoded Unicode to hashlib.sha1.update()
|
|
|
66b169c |
|
|
|
66b169c |
Python 3 compatibility commit.
|
|
|
66b169c |
|
|
|
66b169c |
Related: rhbz#1246459
|
|
|
66b169c |
|
|
|
66b169c |
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
|
66b169c |
---
|
|
|
66b169c |
src/plugins/abrt-action-check-oops-for-hw-error.in | 2 +-
|
|
|
66b169c |
src/plugins/abrt-action-generate-machine-id | 2 +-
|
|
|
66b169c |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
66b169c |
|
|
|
66b169c |
diff --git a/src/plugins/abrt-action-check-oops-for-hw-error.in b/src/plugins/abrt-action-check-oops-for-hw-error.in
|
|
|
66b169c |
index 400ed99..1695ddb 100644
|
|
|
66b169c |
--- a/src/plugins/abrt-action-check-oops-for-hw-error.in
|
|
|
66b169c |
+++ b/src/plugins/abrt-action-check-oops-for-hw-error.in
|
|
|
66b169c |
@@ -88,7 +88,7 @@ if __name__ == "__main__":
|
|
|
66b169c |
oops_hash = hashlib.sha1()
|
|
|
66b169c |
with open("backtrace", "r") as btfile:
|
|
|
66b169c |
for line in btfile:
|
|
|
66b169c |
- oops_hash.update(line)
|
|
|
66b169c |
+ oops_hash.update(line.encode())
|
|
|
66b169c |
|
|
|
66b169c |
with open_or_die("uuid", "w") as f:
|
|
|
66b169c |
f.write(oops_hash.hexdigest())
|
|
|
66b169c |
diff --git a/src/plugins/abrt-action-generate-machine-id b/src/plugins/abrt-action-generate-machine-id
|
|
|
66b169c |
index 1005b2c..63b5c93 100644
|
|
|
66b169c |
--- a/src/plugins/abrt-action-generate-machine-id
|
|
|
66b169c |
+++ b/src/plugins/abrt-action-generate-machine-id
|
|
|
66b169c |
@@ -63,7 +63,7 @@ def generate_machine_id_dmidecode():
|
|
|
66b169c |
data = dmixp.xpathEval(k)
|
|
|
66b169c |
for d in data:
|
|
|
66b169c |
# Update the hash as we find the fields we are looking for
|
|
|
66b169c |
- machine_id.update(d.get_content())
|
|
|
66b169c |
+ machine_id.update(d.get_content().encode())
|
|
|
66b169c |
|
|
|
66b169c |
del dmixp
|
|
|
66b169c |
del xmldoc
|
|
|
66b169c |
--
|
|
|
66b169c |
2.4.6
|
|
|
66b169c |
|