diff --git a/radicale/ical.py b/radicale/ical.py index 9e5a74b..229591d 100644 --- a/radicale/ical.py +++ b/radicale/ical.py @@ -411,11 +411,11 @@ class Calendar(object): def owner_url(self): """Get the calendar URL according to its owner.""" if self.owner: - return '/{}/'.format(self.owner).replace('//', '/') + return ('/%s/' % self.owner).replace('//', '/') else: return None @property def url(self): """Get the standard calendar URL.""" - return '/{}/'.format(self.local_path).replace('//', '/') + return ('/%s/' % self.local_path).replace('//', '/') diff --git a/radicale/xmlutils.py b/radicale/xmlutils.py index 7dffc7e..9ab2f67 100644 --- a/radicale/xmlutils.py +++ b/radicale/xmlutils.py @@ -224,7 +224,7 @@ def _propfind_response(path, item, props, user): if item.owner_url: tag.text = item.owner_url elif user: - tag.text = '/{}/'.format(user) + tag.text = '/%s/' % user else: tag.text = path element.append(tag) @@ -245,7 +245,7 @@ def _propfind_response(path, item, props, user): # pylint: enable=W0511 elif tag == _tag("D", "current-user-principal") and user: tag = ET.Element(_tag("D", "href")) - tag.text = '/{}/'.format(user) + tag.text = '/%s/' % user element.append(tag) elif tag == _tag("D", "current-user-privilege-set"): privilege = ET.Element(_tag("D", "privilege")) @@ -283,8 +283,7 @@ def _propfind_response(path, item, props, user): is404 = True # Not for calendars elif tag == _tag("D", "getcontenttype"): - element.text = \ - "text/calendar; component={}".format(item.tag.lower()) + element.text = "text/calendar; component=%s" % item.tag.lower() else: is404 = True