python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-15 19:31:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38 from olive-oasis/master

Browse Source 
microsecond-bug-fix for datetime.datetime
This commit is contained in:
Andy Dustman
2013-11-21 11:46:46 -08:00
parent c8b2744ea2 fb1c79d85a
commit a7c3ce49fc
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MySQLdb/times.py
View File

@ -51,7 +51,12 @@ def DateTime_or_None(s):
try: try:
d, t = s.split(sep, 1) 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): except (SystemExit, KeyboardInterrupt):
raise raise
except: except:
@ -62,6 +67,7 @@ def TimeDelta_or_None(s):
h, m, s = s.split(':') h, m, s = s.split(':')
if '.' in s: if '.' in s:
s, ms = s.split('.') s, ms = s.split('.')
ms = ms.ljust(6, '0')
else: else:
ms = 0 ms = 0
h, m, s, ms = int(h), int(m), int(s), int(ms) 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(':') h, m, s = s.split(':')
if '.' in s: if '.' in s:
s, ms = s.split('.') s, ms = s.split('.')
ms = ms.ljust(6, '0')
else: else:
ms = 0 ms = 0
h, m, s, ms = int(h), int(m), int(s), int(ms) h, m, s, ms = int(h), int(m), int(s), int(ms)