Formatting

Author: mgrrx

tests/test_common.py

@@ -2,9 +2,9 @@
 
 import pytest
 import xmltodict
-from xmlrpcproto.common import Binary, py2xml, xml2py
 from lxml import etree
 
+from xmlrpcproto.common import Binary, py2xml, xml2py
 
 CASES = [
     (

xmlrpcproto/client.py

@@ -1,26 +1,13 @@
 from typing import Iterable, List, Union, cast
 
 from lxml.builder import E
-from lxml.etree import _Element, XMLParser, fromstring, tostring
+from lxml.etree import XMLParser, _Element, fromstring, tostring
 
-from .common import (
-    XmlRpcTypes,
-    XmlRpcStructType,
-    py2xml,
-    validate_schema,
-    xml2py,
-)
-from .exceptions import (
-    ParseError,
-    ServerError,
-    XMLRPCSystemError,
-    xml2py_exception,
-)
+from .common import XmlRpcStructType, XmlRpcTypes, py2xml, validate_schema, xml2py
+from .exceptions import ParseError, ServerError, XMLRPCSystemError, xml2py_exception
 
 
-def build_xml(
-    method_name: str, *args: Iterable[XmlRpcTypes]
-) -> Union[str, bytes]:
+def build_xml(method_name: str, *args: Iterable[XmlRpcTypes]) -> Union[str, bytes]:
     return b'<?xml version="1.0"?>\n' + tostring(
         E(
             "methodCall",
@@ -34,9 +21,7 @@ def build_xml(
     )
 
 
-def parse_xml(
-    body: bytes, method_name: str, *, huge_tree=False
-) -> XmlRpcTypes:
+def parse_xml(body: bytes, method_name: str, *, huge_tree=False) -> XmlRpcTypes:
     parser = XMLParser(huge_tree=huge_tree)
     response = fromstring(body, parser)
     if not validate_schema(response):
@@ -60,6 +45,5 @@ def parse_xml(
         )
 
     raise ParseError(
-        f'Respond body for method "{method_name}" '
-        "not contains any response."
+        f'Respond body for method "{method_name}" ' "not contains any response."
     )

xmlrpcproto/common.py

@@ -6,7 +6,7 @@
 from typing import Any, Dict, List, Union, cast
 
 from lxml.builder import E
-from lxml.etree import _Element, RelaxNG
+from lxml.etree import RelaxNG, _Element
 
 NoneType = type(None)
 
@@ -117,9 +117,7 @@ def xml2datetime(value: _Element) -> datetime:
             pass
 
     raise ValueError(
-        "It's impossible to parse dataetime with formats {}".format(
-            TIME_FORMATS
-        )
+        "It's impossible to parse dataetime with formats {}".format(TIME_FORMATS)
     )
 
 
@@ -131,13 +129,15 @@ def xml2struct(element: _Element) -> XmlRpcStructType:
 
 def xml2array(element: _Element) -> XmlRpcArrayType:
     values = cast(List[_Element], element.xpath("./data/value"))
+    print(element, values)
     return [xml2py(i) for i in values]
 
+
 def unwrap_value(element: _Element):
     try:
         value = next(element.iterchildren())
     except StopIteration:
-        value = element.text or ''
+        value = element.text or ""
     return xml2py(value)
 
 

xmlrpcproto/exceptions.py

@@ -1,5 +1,5 @@
-from lxml.etree import _Element
 from lxml.builder import E
+from lxml.etree import _Element
 
 from .common import py2xml
 

xmlrpcproto/server.py

@@ -1,14 +1,13 @@
-from typing import Union, List, Mapping, Tuple, cast
+from typing import List, Mapping, Tuple, Union, cast
+
 from lxml.builder import E
-from lxml.etree import _Element, XMLParser, fromstring, tostring
+from lxml.etree import XMLParser, _Element, fromstring, tostring
 
 from .common import XmlRpcTypes, py2xml, validate_schema, xml2py
 
 
 def format_success(result: XmlRpcTypes) -> _Element:
-    return E(
-        "methodResponse", E("params", E("param", E("value", py2xml(result))))
-    )
+    return E("methodResponse", E("params", E("param", E("value", py2xml(result)))))
 
 
 def format_error(exception: Exception) -> _Element:
@@ -24,12 +23,15 @@ def parse_xml(xml_string: bytes) -> _Element:
 
 
 def build_xml(tree: _Element) -> Union[str, bytes]:
-    return b'<?xml version="1.0"?>\n' + tostring(tree, encoding="ASCII")
+    s = b'<?xml version="1.0"?>\n' + tostring(tree, encoding="ASCII")
+    print(s)
+    return s
 
 
 def parse_reqeuest(
     body: bytes, headers: Mapping[str, str]
 ) -> Tuple[str, List[XmlRpcTypes]]:
+    print(body)
     if b"xml" not in headers.get(b"content-type", b""):
         raise ValueError()