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

Fix problem with return None if Datetime field contained microsecond (Issue #24)

Browse Source
This commit is contained in:
Dima Tyzhnenko
2013-07-15 18:11:07 +03:00
parent 63ab17980d
commit 0226f1a727
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
MySQLdb/times.py
View File

@ -60,9 +60,13 @@ def DateTime_or_None(s):
def TimeDelta_or_None(s): def TimeDelta_or_None(s):
try: try:
h, m, s = s.split(':') h, m, s = s.split(':')
h, m, s = int(h), int(m), float(s) if '.' in s:
td = timedelta(hours=abs(h), minutes=m, seconds=int(s), s, ms = s.split('.')
microseconds=int(math.modf(s)[0] * 1000000)) else:
ms = 0
h, m, s, ms = int(h), int(m), int(s), int(ms)
td = timedelta(hours=abs(h), minutes=m, seconds=s,
microseconds=ms)
if h < 0: if h < 0:
return -td return -td
else: else:
@ -74,9 +78,13 @@ def TimeDelta_or_None(s):
def Time_or_None(s): def Time_or_None(s):
try: try:
h, m, s = s.split(':') h, m, s = s.split(':')
h, m, s = int(h), int(m), float(s) if '.' in s:
return time(hour=h, minute=m, second=int(s), s, ms = s.split('.')
microsecond=int(math.modf(s)[0] * 1000000)) else:
ms = 0
h, m, s, ms = int(h), int(m), int(s), int(ms)
return time(hour=h, minute=m, second=s,
microsecond=ms)
except ValueError: except ValueError:
return None return None