oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-09-15 20:36:55 +00:00
Code Wiki Activity

Rename calendar into ical to avoid name collisions.

Browse source
This commit is contained in:
Guillaume Ayoub 2010-02-11 01:41:24 +01:00
parent 9a07ec71d3
commit e1a161edc9
3 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radicale/__init__.py
View file

@ -45,7 +45,7 @@ except ImportError:
import BaseHTTPServer as server
# pylint: enable-msg=F0401
from radicale import acl, calendar, config, xmlutils
from radicale import acl, config, ical, xmlutils
def _check(request, function):
@ -105,12 +105,12 @@ class CalendarHTTPHandler(server.BaseHTTPRequestHandler):
@property
def _calendar(self):
"""The ``calendar.Calendar`` object corresponding to the given path."""
"""The ``ical.Calendar`` object corresponding to the given path."""
# ``normpath`` should clean malformed and malicious request paths
attributes = os.path.normpath(self.path.strip("/")).split("/")
if len(attributes) >= 2:
path = "%s/%s" % (attributes[0], attributes[1])
return calendar.Calendar(path)
return ical.Calendar(path)
def _decode(self, text):
"""Try to decode text according to various parameters."""