From c9878a3dca7e2fe48d88030c3c0c9cf1182face4 Mon Sep 17 00:00:00 2001 From: Jakub Filak Date: Mon, 8 Dec 2014 11:00:17 +0100 Subject: [PATCH] report, client: fix minor python3 incompatibilities Signed-off-by: Jakub Filak --- src/client-python/__init__.py | 1 + src/client-python/debuginfo.py | 4 ++-- src/report-python/__init__.py | 2 +- src/report-python/libreport-meh-test.py | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/client-python/__init__.py b/src/client-python/__init__.py index 8966f22..129149a 100644 --- a/src/client-python/__init__.py +++ b/src/client-python/__init__.py @@ -76,3 +76,4 @@ def error_msg(fmt, *args): def error_msg_and_die(fmt, *args): sys.stderr.write("%s\n" % (fmt % args)) sys.exit(1) + diff --git a/src/client-python/debuginfo.py b/src/client-python/debuginfo.py index 67faa45..421a0aa 100644 --- a/src/client-python/debuginfo.py +++ b/src/client-python/debuginfo.py @@ -84,7 +84,7 @@ def unpack_rpm(package_file_name, files, tmp_dir, destdir, keeprpm, exact_files= package_full_path = tmp_dir + "/" + package_file_name log1("Extracting %s to %s", package_full_path, destdir) log2("%s", files) - print _("Extracting cpio from {0}").format(package_full_path) + print(_("Extracting cpio from {0}").format(package_full_path)) unpacked_cpio_path = tmp_dir + "/unpacked.cpio" try: unpacked_cpio = open(unpacked_cpio_path, 'wb') @@ -447,7 +447,7 @@ class DebugInfoDownload(YumBase): print _("Download cancelled by user") return RETURN_CANCEL_BY_USER - for pkg, files in package_files_dict.iteritems(): + for pkg, files in package_files_dict.items(): dnlcb.downloaded_pkgs = downloaded_pkgs repo.cache = 0 remote = pkg.returnSimple('relativepath') diff --git a/src/report-python/__init__.py b/src/report-python/__init__.py index 71e2d62..6c75eb1 100644 --- a/src/report-python/__init__.py +++ b/src/report-python/__init__.py @@ -236,7 +236,7 @@ def createPythonUnhandledExceptionSignature(**kwargs): raise AttributeError("missing argument {0}".format(arg)) pd = problem_data() - for (key, value) in kwargs.iteritems(): + for (key, value) in kwargs.items(): pd.add(key, value) product = getProduct() if product: -- 2.1.0