From 47ce61533a5364c6d45803a696d86cbcb1ed2b33 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Fri, 29 Jul 2005 21:40:09 +0000
Subject: [PATCH] Fixed #228 -- Better handling of timezones. Thanks, rmunn

git-svn-id: http://code.djangoproject.com/svn/django/trunk@347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/core/db/typecasts.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/django/core/db/typecasts.py b/django/core/db/typecasts.py
index 19d11d84440..9f73ec87a21 100644
--- a/django/core/db/typecasts.py
+++ b/django/core/db/typecasts.py
@@ -21,8 +21,16 @@ def typecast_timestamp(s): # does NOT store time zone information
     # "2005-07-29 09:56:00-05"
     if not s: return None
     d, t = s.split()
-    if t[-3] in ('-', '+'):
-        t = t[:-3] # Remove the time-zone information, if it exists.
+    # Extract timezone information, if it exists. Currently we just throw
+    # it away, but in the future we may make use of it.
+    if '-' in t:
+        t, tz = t.split('-', 1)
+        tz = '-' + tz
+    elif '+' in t:
+        t, tz = t.split('+', 1)
+        tz = '+' + tz
+    else:
+        tz = ''
     dates = d.split('-')
     times = t.split(':')
     seconds = times[2]