indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/30/head
Bob Mottram 2022-06-12 21:03:03 +01:00
parent 94854ae7c2
commit fd279807b0
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon.py
View File

@ -18524,14 +18524,12 @@ class PubServer(BaseHTTPRequestHandler):
response_str = None response_str = None
if endpoint_type == 'propfind': if endpoint_type == 'propfind':
response_str = \ response_str = \
dav_propfind_response(self.server.base_dir, dav_propfind_response(nickname, propfind_xml)
nickname, self.server.domain,
depth, propfind_xml)
elif endpoint_type == 'put': elif endpoint_type == 'put':
response_str = \ response_str = \
dav_put_response(self.server.base_dir, dav_put_response(self.server.base_dir,
nickname, self.server.domain, nickname, self.server.domain,
depth, propfind_xml, propfind_xml,
self.server.http_prefix, self.server.http_prefix,
self.server.system_language, self.server.system_language,
self.server.recent_dav_etags) self.server.recent_dav_etags)
@ -18544,7 +18542,7 @@ class PubServer(BaseHTTPRequestHandler):
response_str = \ response_str = \
dav_report_response(self.server.base_dir, dav_report_response(self.server.base_dir,
nickname, self.server.domain, nickname, self.server.domain,
depth, propfind_xml, propfind_xml,
self.server.person_cache, self.server.person_cache,
self.server.http_prefix, self.server.http_prefix,
curr_etag, curr_etag,

7
happening.py
View File

@ -793,8 +793,7 @@ def _dav_decode_token(token: str) -> (int, int, str):
return token_year, token_month_number, token_post_id return token_year, token_month_number, token_post_id
def dav_propfind_response(base_dir: str, nickname: str, domain: str, def dav_propfind_response(nickname: str, xml_str: str) -> str:
depth: int, xml_str: str) -> str:
"""Returns the response to caldav PROPFIND """Returns the response to caldav PROPFIND
""" """
if '<d:propfind' not in xml_str or \ if '<d:propfind' not in xml_str or \
@ -977,7 +976,7 @@ def _dav_update_recent_etags(etag: str, nickname: str,
def dav_put_response(base_dir: str, nickname: str, domain: str, def dav_put_response(base_dir: str, nickname: str, domain: str,
depth: int, xml_str: str, http_prefix: str, xml_str: str, http_prefix: str,
system_language: str, system_language: str,
recent_dav_etags: {}) -> str: recent_dav_etags: {}) -> str:
"""Returns the response to caldav PUT """Returns the response to caldav PUT
@ -1023,7 +1022,7 @@ def dav_put_response(base_dir: str, nickname: str, domain: str,
def dav_report_response(base_dir: str, nickname: str, domain: str, def dav_report_response(base_dir: str, nickname: str, domain: str,
depth: int, xml_str: str, xml_str: str,
person_cache: {}, http_prefix: str, person_cache: {}, http_prefix: str,
curr_etag: str, recent_dav_etags: {}, curr_etag: str, recent_dav_etags: {},
domain_full: str, system_language: str) -> str: domain_full: str, system_language: str) -> str: