From 75aef38a6d23cbfe09e153319854a15980e45c12 Mon Sep 17 00:00:00 2001 From: Markus Birth Date: Sat, 10 Feb 2018 02:38:06 +0100 Subject: [PATCH] More cleanup. --- tcllib/requests/runner.py | 4 ++-- tcllib/requests/tclresult.py | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tcllib/requests/runner.py b/tcllib/requests/runner.py index 8f812e2..b5fd3cc 100644 --- a/tcllib/requests/runner.py +++ b/tcllib/requests/runner.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from . import tcl +from .tclrequest import TclRequest from . import http from . import serverselector @@ -25,7 +25,7 @@ class RequestRunner: """Returns a master server.""" return self.server_selector.get_master_server() - def run(self, query: tcl.TclRequest, timeout: int=10) -> bool: + def run(self, query: TclRequest, timeout: int=10) -> bool: """Runs the actual query.""" for _ in range(0, self.max_tries): url = "{}{}{}".format(self.protocol, self.get_server(), query.uri) diff --git a/tcllib/requests/tclresult.py b/tcllib/requests/tclresult.py index ced8ebb..3fe7806 100644 --- a/tcllib/requests/tclresult.py +++ b/tcllib/requests/tclresult.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- +import xml.dom.minidom + from defusedxml import ElementTree from . import dumpmgr @@ -14,6 +16,11 @@ class TclResult: def delete_dump(self): self.dumper.delete_last_dump() + def pretty_xml(self): + """Return prettified input XML with ``xml.dom.minidom``.""" + mdx = xml.dom.minidom.parseString(self.raw_xml) + return mdx.toprettyxml(indent=" ") + class CheckResult(TclResult): def __init__(self, xml: str): super().__init__(xml)