From 7642d729197b86e10c1d0201e7a6f690598e77f8 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sat, 26 Sep 2020 22:08:21 +0200 Subject: [PATCH] Improve variable names --- radicale/app/propfind.py | 62 ++++++++++++++++++++------------------ radicale/app/report.py | 16 +++++----- radicale/tests/__init__.py | 10 +++--- 3 files changed, 46 insertions(+), 42 deletions(-) diff --git a/radicale/app/propfind.py b/radicale/app/propfind.py index 106e2e8..59162a6 100644 --- a/radicale/app/propfind.py +++ b/radicale/app/propfind.py @@ -40,18 +40,18 @@ def xml_propfind(base_prefix, path, xml_request, allowed_items, user, """ # A client may choose not to submit a request body. An empty PROPFIND # request body MUST be treated as if it were an 'allprop' request. - top_tag = (xml_request[0] if xml_request is not None else - ET.Element(xmlutils.make_clark("D:allprop"))) + top_element = (xml_request[0] if xml_request is not None else + ET.Element(xmlutils.make_clark("D:allprop"))) props = () allprop = False propname = False - if top_tag.tag == xmlutils.make_clark("D:allprop"): + if top_element.tag == xmlutils.make_clark("D:allprop"): allprop = True - elif top_tag.tag == xmlutils.make_clark("D:propname"): + elif top_element.tag == xmlutils.make_clark("D:propname"): propname = True - elif top_tag.tag == xmlutils.make_clark("D:prop"): - props = [prop.tag for prop in top_tag] + elif top_element.tag == xmlutils.make_clark("D:prop"): + props = [prop.tag for prop in top_element] if xmlutils.make_clark("D:current-user-principal") in props and not user: # Ask for authentication @@ -152,17 +152,17 @@ def xml_propfind_response(base_prefix, path, item, props, user, encoding, else: is404 = True elif tag == xmlutils.make_clark("D:principal-collection-set"): - tag = ET.Element(xmlutils.make_clark("D:href")) - tag.text = xmlutils.make_href(base_prefix, "/") - element.append(tag) + child_element = ET.Element(xmlutils.make_clark("D:href")) + child_element.text = xmlutils.make_href(base_prefix, "/") + element.append(child_element) elif (tag in (xmlutils.make_clark("C:calendar-user-address-set"), xmlutils.make_clark("D:principal-URL"), xmlutils.make_clark("CR:addressbook-home-set"), xmlutils.make_clark("C:calendar-home-set")) and collection.is_principal and is_collection): - tag = ET.Element(xmlutils.make_clark("D:href")) - tag.text = xmlutils.make_href(base_prefix, path) - element.append(tag) + child_element = ET.Element(xmlutils.make_clark("D:href")) + child_element.text = xmlutils.make_href(base_prefix, path) + element.append(child_element) elif tag == xmlutils.make_clark("C:supported-calendar-component-set"): human_tag = xmlutils.make_human_tag(tag) if is_collection and is_leaf: @@ -179,9 +179,10 @@ def xml_propfind_response(base_prefix, path, item, props, user, encoding, is404 = True elif tag == xmlutils.make_clark("D:current-user-principal"): if user: - tag = ET.Element(xmlutils.make_clark("D:href")) - tag.text = xmlutils.make_href(base_prefix, "/%s/" % user) - element.append(tag) + child_element = ET.Element(xmlutils.make_clark("D:href")) + child_element.text = xmlutils.make_href( + base_prefix, "/%s/" % user) + element.append(child_element) else: element.append(ET.Element( xmlutils.make_clark("D:unauthenticated"))) @@ -213,9 +214,10 @@ def xml_propfind_response(base_prefix, path, item, props, user, encoding, for human_tag in reports: supported_report = ET.Element( xmlutils.make_clark("D:supported-report")) - report_tag = ET.Element(xmlutils.make_clark("D:report")) - report_tag.append(ET.Element(xmlutils.make_clark(human_tag))) - supported_report.append(report_tag) + report_element = ET.Element(xmlutils.make_clark("D:report")) + report_element.append( + ET.Element(xmlutils.make_clark(human_tag))) + supported_report.append(report_element) element.append(supported_report) elif tag == xmlutils.make_clark("D:getcontentlength"): if not is_collection or is_leaf: @@ -225,10 +227,10 @@ def xml_propfind_response(base_prefix, path, item, props, user, encoding, elif tag == xmlutils.make_clark("D:owner"): # return empty elment, if no owner available (rfc3744-5.1) if collection.owner: - tag = ET.Element(xmlutils.make_clark("D:href")) - tag.text = xmlutils.make_href( + child_element = ET.Element(xmlutils.make_clark("D:href")) + child_element.text = xmlutils.make_href( base_prefix, "/%s/" % collection.owner) - element.append(tag) + element.append(child_element) elif is_collection: if tag == xmlutils.make_clark("D:getcontenttype"): if is_leaf: @@ -237,18 +239,20 @@ def xml_propfind_response(base_prefix, path, item, props, user, encoding, is404 = True elif tag == xmlutils.make_clark("D:resourcetype"): if item.is_principal: - tag = ET.Element(xmlutils.make_clark("D:principal")) - element.append(tag) + child_element = ET.Element( + xmlutils.make_clark("D:principal")) + element.append(child_element) if is_leaf: if item.get_meta("tag") == "VADDRESSBOOK": - tag = ET.Element( + child_element = ET.Element( xmlutils.make_clark("CR:addressbook")) - element.append(tag) + element.append(child_element) elif item.get_meta("tag") == "VCALENDAR": - tag = ET.Element(xmlutils.make_clark("C:calendar")) - element.append(tag) - tag = ET.Element(xmlutils.make_clark("D:collection")) - element.append(tag) + child_element = ET.Element( + xmlutils.make_clark("C:calendar")) + element.append(child_element) + child_element = ET.Element(xmlutils.make_clark("D:collection")) + element.append(child_element) elif tag == xmlutils.make_clark("RADICALE:displayname"): # Only for internal use by the web interface displayname = item.get_meta("D:displayname") diff --git a/radicale/app/report.py b/radicale/app/report.py index 18ea4e7..528b17f 100644 --- a/radicale/app/report.py +++ b/radicale/app/report.py @@ -104,8 +104,8 @@ def xml_report(base_prefix, path, xml_request, collection, encoding, else: hreferences = (path,) filters = ( - root.findall("./%s" % xmlutils.make_clark("C:filter")) + - root.findall("./%s" % xmlutils.make_clark("CR:filter"))) + root.findall(xmlutils.make_clark("C:filter")) + + root.findall(xmlutils.make_clark("CR:filter"))) def retrieve_items(collection, hreferences, multistatus): """Retrieves all items that are referenced in ``hreferences`` from @@ -231,9 +231,9 @@ def xml_item_response(base_prefix, href, found_props=(), not_found_props=(), found_item=True): response = ET.Element(xmlutils.make_clark("D:response")) - href_tag = ET.Element(xmlutils.make_clark("D:href")) - href_tag.text = xmlutils.make_href(base_prefix, href) - response.append(href_tag) + href_element = ET.Element(xmlutils.make_clark("D:href")) + href_element.text = xmlutils.make_href(base_prefix, href) + response.append(href_element) if found_item: for code, props in ((200, found_props), (404, not_found_props)): @@ -241,10 +241,10 @@ def xml_item_response(base_prefix, href, found_props=(), not_found_props=(), propstat = ET.Element(xmlutils.make_clark("D:propstat")) status = ET.Element(xmlutils.make_clark("D:status")) status.text = xmlutils.make_response(code) - prop_tag = ET.Element(xmlutils.make_clark("D:prop")) + prop_element = ET.Element(xmlutils.make_clark("D:prop")) for prop in props: - prop_tag.append(prop) - propstat.append(prop_tag) + prop_element.append(prop) + propstat.append(prop_element) propstat.append(status) response.append(propstat) else: diff --git a/radicale/tests/__init__.py b/radicale/tests/__init__.py index e2e283e..a3de300 100644 --- a/radicale/tests/__init__.py +++ b/radicale/tests/__init__.py @@ -76,11 +76,11 @@ class BaseTest: status = propstat.find(xmlutils.make_clark("D:status")) assert status.text.startswith("HTTP/1.1 ") status_code = int(status.text.split(" ")[1]) - for prop in propstat.findall(xmlutils.make_clark("D:prop")): - for element in prop: - human_tag = xmlutils.make_human_tag(element.tag) - assert human_tag not in prop_respones - prop_respones[human_tag] = (status_code, element) + for element in propstat.findall( + "./%s/*" % xmlutils.make_clark("D:prop")): + human_tag = xmlutils.make_human_tag(element.tag) + assert human_tag not in prop_respones + prop_respones[human_tag] = (status_code, element) status = response.find(xmlutils.make_clark("D:status")) if status is not None: assert not prop_respones