Merge pull request #7 from kleinron/master

typo + code reuse

docs/source/data.rst

@@ -296,7 +296,7 @@ Serialization
 
 Models are responsible not only for declaring a schema and validating the data, but also for serializing the models to useful data structures. 
 Controlling the way data models are serialized is extremely useful when creating APIs.
-More often than not, the application's requirements dicate cases other than a straightforward one-to-one mapping between the data attributes of a model and the API.
+More often than not, the application's requirements dictate cases other than a straightforward one-to-one mapping between the data attributes of a model and the API.
 In some cases there may be a need to omit some data, which is meant only for internal use and not for API consumption. 
 In other cases there may be additional data attributes, required as part of an API endpoint, which are a result of a calculation, aggregation, or data manipulation between 1 or more data attributes. 
 

tbone/data/models.py

@@ -250,9 +250,10 @@ def _convert(self, data, native):
         converted_data = {}
         for name, field in self._fields.items():
             if native is True:
-                converted_data[name] = field.to_python(data.get(name))
+                conversion_func = field.to_python
             else:
-                converted_data[name] = field.to_data(data.get(name))
+                conversion_func = field.to_data
+            converted_data[name] = conversion_func(data.get(name))
         return converted_data
 
     def import_data(self, data: dict):