diff --git a/README.rst b/README.rst index 26232e4..698c241 100644 --- a/README.rst +++ b/README.rst @@ -85,6 +85,11 @@ Features Changelog --------- +Version 0.9.2 +------------- + +- Fix timezone when convert timestamp to datetime. + Version 0.9.1 ------------- diff --git a/dirty_models/__init__.py b/dirty_models/__init__.py index a8269b8..0163357 100644 --- a/dirty_models/__init__.py +++ b/dirty_models/__init__.py @@ -7,4 +7,4 @@ from .models import * from .fields import * -__version__ = '0.9.1' +__version__ = '0.9.2' diff --git a/dirty_models/fields.py b/dirty_models/fields.py index d36baa6..9842b9e 100644 --- a/dirty_models/fields.py +++ b/dirty_models/fields.py @@ -416,7 +416,7 @@ def convert_value(self, value): elif isinstance(value, dict): return time(**value) elif isinstance(value, int): - return self.convert_value(datetime.fromtimestamp(value)) + return self.convert_value(datetime.fromtimestamp(value, tz=self.default_timezone)) elif isinstance(value, str): try: if not self.parse_format: @@ -547,7 +547,7 @@ def convert_value(self, value): elif isinstance(value, dict): return datetime(**value) elif isinstance(value, int): - return datetime.fromtimestamp(value) + return datetime.fromtimestamp(value, tz=self.default_timezone) elif isinstance(value, str): try: if not self.parse_format: