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
2 changes: 2 additions & 0 deletions msrest/serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,8 @@ def serialize_object(self, attr, **kwargs):
return self.serialize_time(attr)
if obj_type is datetime.timedelta:
return self.serialize_duration(attr)
if obj_type is decimal.Decimal:
return self.serialize_decimal(attr)

# If it's a model or I know this dependency, serialize as a Model
elif obj_type in self.dependencies.values() or isinstance(attr, Model):
Expand Down
16 changes: 16 additions & 0 deletions tests/test_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#
#--------------------------------------------------------------------------

from decimal import Decimal
import sys
import json
import isodate
Expand Down Expand Up @@ -1416,6 +1417,21 @@ class TestModel(Model):
'timedelta': 'P56D'
}

def test_decimal_types_as_type_object(self):
"""https://github.com/Azure/msrest-for-python/issues/223
"""

class TestModel(Model):
_attribute_map = {'data': {'key': 'data', 'type': 'object'}}

m = TestModel(data = {
'decimal': Decimal('1.1'),
})
serialized = m.serialize()
assert serialized['data'] == {
'decimal': 1.1
}

def test_json_with_xml_map(self):
basic_json = {'age': 37, 'country': 'france'}

Expand Down