summaryrefslogtreecommitdiff
path: root/babel/dates.py
diff options
context:
space:
mode:
authorChristopher Lenz <cmlenz@gmail.com>2008-07-07 20:55:15 +0000
committerChristopher Lenz <cmlenz@gmail.com>2008-07-07 20:55:15 +0000
commitdeae48d9a410fc2d52b84cad9484073934dccb1a (patch)
tree6e5b7a40f8f75961676d11aaed3104d8f48e0f02 /babel/dates.py
parent4a6c0f5e1ba853040bf83466e2e2b865c2b76476 (diff)
downloadbabel-deae48d9a410fc2d52b84cad9484073934dccb1a.tar.gz
Fix conversion of timestamp to `datetime` in `format_datetime()`
Diffstat (limited to 'babel/dates.py')
-rw-r--r--babel/dates.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/babel/dates.py b/babel/dates.py
index 737c2a5..456b820 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -488,7 +488,7 @@ def format_datetime(datetime=None, format='medium', tzinfo=None,
if datetime is None:
datetime = datetime_.utcnow()
elif isinstance(datetime, (int, long)):
- datetime = datetime.utcfromtimestamp(datetime)
+ datetime = datetime_.utcfromtimestamp(datetime)
elif isinstance(datetime, time):
datetime = datetime_.combine(date.today(), datetime)
if datetime.tzinfo is None: