From c422206cc7e5de9cd94c30811489e78817290c59 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Jun 23 2017 12:45:05 +0000 Subject: py3: dogtag.py: fix bytes warnings /usr/lib/python3.5/site-packages/ipaserver/plugins/dogtag.py:1438: BytesWarning: str() on a bytes instance "parse_result:\\n%s" % (parse_func.__name__, xml_text, result)) https://pagure.io/freeipa/issue/4985 Reviewed-By: Stanislav Laznicka --- diff --git a/.travis.yml b/.travis.yml index 61b81c5..db47af2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,8 @@ env: - TASK_TO_RUN="run-tests" PYTHON=/usr/bin/python3 TEST_RUNNER_CONFIG=".test_runner_config_py3_temp.yaml" - TESTS_TO_RUN="test_xmlrpc/test_attr.py + TESTS_TO_RUN="test_xmlrpc/test_add_remove_cert_cmd.py + test_xmlrpc/test_attr.py test_xmlrpc/test_automember_plugin.py test_xmlrpc/test_automount_plugin.py test_xmlrpc/test_baseldap_plugin.py @@ -52,7 +53,6 @@ env: test_xmlrpc/test_krbtpolicy.py" ### Tests which haven't been ported to py3 yet ### ## test_xmlrpc/test_[a-k]*.py - # test_xmlrpc/test_add_remove_cert_cmd.py # test_xmlrpc/test_ca_plugin.py # test_xmlrpc/test_caacl_plugin.py # test_xmlrpc/test_caacl_profile_enforcement.py diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py index 0e68de6..f868076 100644 --- a/ipaserver/plugins/dogtag.py +++ b/ipaserver/plugins/dogtag.py @@ -1434,8 +1434,9 @@ class ra(rabase.rabase, RestClient): self.raise_certificate_operation_error('get_parse_result_xml', detail=str(e)) result = parse_func(doc) - self.debug("%s() xml_text:\n%s\n" - "parse_result:\n%s" % (parse_func.__name__, xml_text, result)) + self.debug( + "%s() xml_text:\n%r\nparse_result:\n%r", + parse_func.__name__, xml_text, result) return result def check_request_status(self, request_id):