Skip to content

Add time type to serialization #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2020
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
30 changes: 30 additions & 0 deletions msrest/serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ def __init__(self, classes=None):
'unix-time': Serializer.serialize_unix,
'duration': Serializer.serialize_duration,
'date': Serializer.serialize_date,
'time': Serializer.serialize_time,
'decimal': Serializer.serialize_decimal,
'long': Serializer.serialize_long,
'bytearray': Serializer.serialize_bytearray,
Expand Down Expand Up @@ -999,6 +1000,20 @@ def serialize_date(attr, **kwargs):
t = "{:04}-{:02}-{:02}".format(attr.year, attr.month, attr.day)
return t

@staticmethod
def serialize_time(attr, **kwargs):
"""Serialize Time object into ISO-8601 formatted string.

:param datetime.time attr: Object to be serialized.
:rtype: str
"""
if isinstance(attr, str):
attr = isodate.parse_time(attr)
t = "{:02}:{:02}:{:02}".format(attr.hour, attr.minute, attr.second)
if attr.microsecond:
t += ".{:02}".format(attr.microsecond)
return t

@staticmethod
def serialize_duration(attr, **kwargs):
"""Serialize TimeDelta object into ISO-8601 formatted string.
Expand Down Expand Up @@ -1230,6 +1245,7 @@ def __init__(self, classes=None):
'unix-time': Deserializer.deserialize_unix,
'duration': Deserializer.deserialize_duration,
'date': Deserializer.deserialize_date,
'time': Deserializer.deserialize_time,
'decimal': Deserializer.deserialize_decimal,
'long': Deserializer.deserialize_long,
'bytearray': Deserializer.deserialize_bytearray,
Expand Down Expand Up @@ -1763,6 +1779,20 @@ def deserialize_date(attr):
# This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception.
return isodate.parse_date(attr, defaultmonth=None, defaultday=None)

@staticmethod
def deserialize_time(attr):
"""Deserialize ISO-8601 formatted string into time object.

:param str attr: response string to be deserialized.
:rtype: datetime.time
:raises: DeserializationError if string format invalid.
"""
if isinstance(attr, ET.Element):
attr = attr.text
if re.search(r"[^\W\d_]", attr, re.I + re.U):
raise DeserializationError("Date must have only digits and -. Received: %s" % attr)
return isodate.parse_time(attr)

@staticmethod
def deserialize_rfc(attr):
"""Deserialize RFC-1123 formatted string into Datetime object.
Expand Down
17 changes: 16 additions & 1 deletion tests/test_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import isodate
import logging
from enum import Enum
from datetime import datetime, timedelta, date
from datetime import datetime, timedelta, date, time
import unittest

import xml.etree.ElementTree as ET
Expand Down Expand Up @@ -800,6 +800,14 @@ def test_serialize_datetime(self):
date_str = Serializer.serialize_iso(date_obj)
assert date_str == '2012-02-24T00:53:52.780Z'

def test_serialize_time(self):

time_str = Serializer.serialize_time(time(11,22,33))
assert time_str == "11:22:33"

time_str = Serializer.serialize_time(time(11,22,33,444))
assert time_str == "11:22:33.444"

def test_serialize_primitive_types(self):

a = self.s.serialize_data(1, 'int')
Expand Down Expand Up @@ -1814,6 +1822,13 @@ def test_deserialize_date(self):
with self.assertRaises(DeserializationError):
a = Deserializer.deserialize_date('201O-18-90')

def test_deserialize_time(self):
a = Deserializer.deserialize_time('11:22:33')
assert time(11,22,33) == a

with self.assertRaises(DeserializationError):
Deserializer.deserialize_time('1O:22:33')

def test_deserialize_datetime(self):

a = Deserializer.deserialize_iso('9999-12-31T23:59:59+23:59')
Expand Down