summaryrefslogtreecommitdiffstats
path: root/openstack/common/timeutils.py
diff options
context:
space:
mode:
authorZhongyue Luo <zhongyue.nah@intel.com>2012-09-11 14:03:47 +0800
committerZhongyue Luo <zhongyue.nah@intel.com>2012-09-13 06:07:49 +0800
commit2265258dad5c6a1e535336867d9cea5c7a2355d3 (patch)
tree1c36cf2838abbfb6e9d73f77f5c509d3fdc093df /openstack/common/timeutils.py
parentccaaa26dd3afa62599ea3b476e2a5d1af7e075ef (diff)
downloadoslo-2265258dad5c6a1e535336867d9cea5c7a2355d3.tar.gz
oslo-2265258dad5c6a1e535336867d9cea5c7a2355d3.tar.xz
oslo-2265258dad5c6a1e535336867d9cea5c7a2355d3.zip
Use pep8 v1.3.3
Fixed indents which violate pep8 1.3.3 Also added .mailmap file to coalesce commits Change-Id: Ia7a788a28e6c0fd9cb52fb7ea477cddd7d589e58
Diffstat (limited to 'openstack/common/timeutils.py')
-rw-r--r--openstack/common/timeutils.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/openstack/common/timeutils.py b/openstack/common/timeutils.py
index c4f6cf0..9901a4c 100644
--- a/openstack/common/timeutils.py
+++ b/openstack/common/timeutils.py
@@ -121,6 +121,10 @@ def marshall_now(now=None):
def unmarshall_time(tyme):
"""Unmarshall a datetime dict."""
- return datetime.datetime(day=tyme['day'], month=tyme['month'],
- year=tyme['year'], hour=tyme['hour'], minute=tyme['minute'],
- second=tyme['second'], microsecond=tyme['microsecond'])
+ return datetime.datetime(day=tyme['day'],
+ month=tyme['month'],
+ year=tyme['year'],
+ hour=tyme['hour'],
+ minute=tyme['minute'],
+ second=tyme['second'],
+ microsecond=tyme['microsecond'])