Rename tzinfo_from_dt to tzid_from_dt, which is what it does.

pull/86/merge
Johannes Raggam 2013-02-20 18:42:02 +01:00
rodzic 2ceffaa1ab
commit e9865d0119
3 zmienionych plików z 16 dodań i 6 usunięć

Wyświetl plik

@ -5,6 +5,12 @@ Changelog
3.4dev (unreleased)
-------------------
- Rename tzinfo_from_dt to tzid_from_dt, which is what it does.
[thet]
- More support for dateutil parsed tzinfo objects. Fixes #89.
[leo-naeka]
- Remove python-dateutil version fix.
[thet]

Wyświetl plik

@ -36,12 +36,16 @@ def unescape_char(text):
.replace('\\\\', '\\')
def tzinfo_from_dt(dt):
def tzid_from_dt(dt):
tzid = None
if hasattr(dt.tzinfo, 'zone'):
tzid = dt.tzinfo.zone # pytz implementation
elif hasattr(dt.tzinfo, 'tzname'):
tzid = dt.tzinfo.tzname(dt) # dateutil implementation
try:
tzid = dt.tzinfo.tzname(dt) # dateutil implementation
except AttributeError:
# No tzid available
pass
return tzid

Wyświetl plik

@ -55,7 +55,7 @@ from icalendar.caselessdict import CaselessDict
from icalendar.parser import Parameters
from icalendar.parser import escape_char
from icalendar.parser import unescape_char
from icalendar.parser import tzinfo_from_dt
from icalendar.parser import tzid_from_dt
SequenceTypes = [TupleType, ListType]
@ -433,7 +433,7 @@ class vDDDTypes:
tzinfo = dt.tzinfo
if tzinfo is not pytz.utc and not isinstance(tzinfo, tzutc):
# set the timezone as a parameter to the property
tzid = tzinfo_from_dt(dt)
tzid = tzid_from_dt(dt)
if tzid:
self.params.update({'TZID': tzid})
self.dt = dt
@ -572,7 +572,7 @@ class vDatetime:
def to_ical(self):
dt = self.dt
tzid = tzinfo_from_dt(dt)
tzid = tzid_from_dt(dt)
s = "%04d%02d%02dT%02d%02d%02d" % (
dt.year,
@ -795,7 +795,7 @@ class vPeriod:
self.params = Parameters()
# set the timezone identifier
# does not support different timezones for start and end
tzid = tzinfo_from_dt(start)
tzid = tzid_from_dt(start)
if tzid:
self.params['TZID'] = tzid