Skip to content

Commit

Permalink
Merge pull request #10 from thombashi/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
thombashi committed Mar 1, 2016
2 parents 542bd8e + 2a169c9 commit 1faf75f
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
23 changes: 23 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -384,12 +384,35 @@ Documentation

http://datetimerange.readthedocs.org/en/latest/datetimerange.html

Note
----

Use not the daylight saving time (DST) offset, but the standard time
offset when you use datetime string as an argument. DateTimeRange class
will automatically calculate daylight saving time. Some examples are
below

.. code:: console
>>>from datetimerange import DateTimeRange
>>>time_range = DateTimeRange("2015-03-08T00:00:00-0400", "2015-03-08T12:00:00-0400")
>>>time_range.timedelta
datetime.timedelta(0, 39600) # 11 hours
.. code:: console
>>>from datetimerange import DateTimeRange
>>>time_range = DateTimeRange("2015-11-01T00:00:00-0400", "2015-11-01T12:00:00-0400")
>>>time_range.timedelta
datetime.timedelta(0, 46800) # 13 hours
Dependencies
============

Python 2.5+ or 3.3+

- `python-dateutil <https://pypi.python.org/pypi/python-dateutil/>`__
- `pytz <https://pypi.python.org/pypi/pytz>`__

Test dependencies
-----------------
Expand Down
8 changes: 4 additions & 4 deletions datetimerange/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ def __get_timedelta_sec(dt):
dt.days * 60 ** 2 * 24 + float(dt.seconds) +
float(dt.microseconds / (1000.0 ** 2)))

def __get_timezone_name(self, offset):
def __get_dst_timezone_name(self, offset):
return self.__COMMON_DST_TIMEZONE_TABLE.get(offset)

def __convert_datetime(self, value):
Expand All @@ -607,15 +607,15 @@ def __convert_datetime(self, value):
return None

try:
timezone_name = self.__get_timezone_name(
dst_timezone_name = self.__get_dst_timezone_name(
self.__get_timedelta_sec(dt.utcoffset()))
except AttributeError:
return dt

if timezone_name is None:
if dst_timezone_name is None:
return dt

pytz_timezone = pytz.timezone(timezone_name)
pytz_timezone = pytz.timezone(dst_timezone_name)
dt = dt.replace(tzinfo=None)
dt = pytz_timezone.localize(dt)

Expand Down

0 comments on commit 1faf75f

Please sign in to comment.