diff options
author | Andy Dustman <farcepest@gmail.com> | 2013-11-21 11:46:46 -0800 |
---|---|---|
committer | Andy Dustman <farcepest@gmail.com> | 2013-11-21 11:46:46 -0800 |
commit | a7c3ce49fcdb4fee1ec6bb69295cb25f467f66ff (patch) | |
tree | 3568609a6c2b088e8f4767b44b4a8fc82400dbf1 | |
parent | c8b2744ea2b1e4419b7e3d93928e92c95f366815 (diff) | |
parent | fb1c79d85a87345525ba82cfdca470c4ef565a3c (diff) | |
download | mysqldb1-a7c3ce49fcdb4fee1ec6bb69295cb25f467f66ff.tar.gz |
Merge pull request #38 from olive-oasis/master
microsecond-bug-fix for datetime.datetime
-rw-r--r-- | MySQLdb/times.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MySQLdb/times.py b/MySQLdb/times.py index f3a92d7..0ff7476 100644 --- a/MySQLdb/times.py +++ b/MySQLdb/times.py @@ -51,7 +51,12 @@ def DateTime_or_None(s): try: d, t = s.split(sep, 1) - return datetime(*[ int(x) for x in d.split('-')+t.split(':') ]) + if '.' in t: + t, ms = t.split('.',1) + ms = ms.ljust(6, '0') + else: + ms = 0 + return datetime(*[ int(x) for x in d.split('-')+t.split(':')+[ms] ]) except (SystemExit, KeyboardInterrupt): raise except: @@ -62,6 +67,7 @@ def TimeDelta_or_None(s): h, m, s = s.split(':') if '.' in s: s, ms = s.split('.') + ms = ms.ljust(6, '0') else: ms = 0 h, m, s, ms = int(h), int(m), int(s), int(ms) @@ -80,6 +86,7 @@ def Time_or_None(s): h, m, s = s.split(':') if '.' in s: s, ms = s.split('.') + ms = ms.ljust(6, '0') else: ms = 0 h, m, s, ms = int(h), int(m), int(s), int(ms) |