Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions hl7/datatypes.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import datetime
import math
import re

DTM_TZ_RE = re.compile(r"(\d+(?:\.\d+)?)(?:([+-]\d{2})(\d{2}))?")
Expand All @@ -17,6 +16,14 @@ def __init__(self, minutes):
# used.
self.minutes = int(minutes)

def __eq__(self, other):
if isinstance(other, _UTCOffset):
return self.minutes == other.minutes
return NotImplemented

def __hash__(self):
return hash(self.minutes)

def utcoffset(self, dt):
return datetime.timedelta(minutes=self.minutes)

Expand Down Expand Up @@ -49,8 +56,9 @@ def parse_datetime(value):
tzh = dt_match.group(2)
tzm = dt_match.group(3)
if tzh and tzm:
sign = -1 if tzh.startswith("-") else 1
minutes = int(tzh) * 60
minutes += math.copysign(int(tzm), minutes)
minutes += sign * int(tzm)
tzinfo = _UTCOffset(minutes)
else:
tzinfo = None
Expand Down
15 changes: 15 additions & 0 deletions tests/test_datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,18 @@ def test_parse_tzname(self):
def test_utc_offset_float(self):
self.assertEqual("-0500", _UTCOffset(-300.0).tzname(datetime.utcnow()))
self.assertEqual("+0530", _UTCOffset(330.0).tzname(datetime.utcnow()))

def test_parse_negative_zero_offset(self):
dt = parse_datetime("201403111412-0030")
self.assertEqual(dt.tzinfo, _UTCOffset(-30))

def test_utcoffset_equality(self):
self.assertEqual(_UTCOffset(60), _UTCOffset(60))
self.assertNotEqual(_UTCOffset(60), _UTCOffset(-60))
self.assertNotEqual(_UTCOffset(60), 60)

def test_utcoffset_hash(self):
a = _UTCOffset(45)
b = _UTCOffset(45)
self.assertEqual(hash(a), hash(b))
self.assertEqual(len({a, b}), 1)
Loading