Mercurial > p > mysql-python > mysqldb-2

comparison MySQLdb/times.py @ 4:b5a377255eea MySQLdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes from MySQLdb-1.2 branch (448-455)
author adustman
date Tue, 24 Oct 2006 19:52:31 +0000
parents e48810735f11
children aef6ea6a9737
comparison
equal deleted inserted replaced
3:df195ac92df6 4:b5a377255eea
27 def TimestampFromTicks(ticks): 27 def TimestampFromTicks(ticks):
28 """Convert UNIX ticks into a datetime instance.""" 28 """Convert UNIX ticks into a datetime instance."""
29 return datetime(*localtime(ticks)[:6]) 29 return datetime(*localtime(ticks)[:6])
30 30
31 format_TIME = format_DATE = str 31 format_TIME = format_DATE = str
32
33 def format_TIMEDELTA(v):
34 seconds = int(v.seconds) % 60
35 minutes = int(v.seconds / 60) % 60
36 hours = int(v.seconds / 3600) % 24
37 return '%d %d:%d:%d' % (v.days, hours, minutes, seconds)
32 38
33 def format_TIMESTAMP(d): 39 def format_TIMESTAMP(d):
34 return d.strftime("%Y-%m-%d %H:%M:%S") 40 return d.strftime("%Y-%m-%d %H:%M:%S")
35 41
36 42
78 """Format a DateTime object as an ISO timestamp.""" 84 """Format a DateTime object as an ISO timestamp."""
79 return string_literal(format_TIMESTAMP(d),c) 85 return string_literal(format_TIMESTAMP(d),c)
80 86
81 def DateTimeDelta2literal(d, c): 87 def DateTimeDelta2literal(d, c):
82 """Format a DateTimeDelta object as a time.""" 88 """Format a DateTimeDelta object as a time."""
83 return string_literal(format_TIME(d),c) 89 return string_literal(format_TIMEDELTA(d),c)
84 90
85 def mysql_timestamp_converter(s): 91 def mysql_timestamp_converter(s):
86 """Convert a MySQL TIMESTAMP to a Timestamp object.""" 92 """Convert a MySQL TIMESTAMP to a Timestamp object."""
87 # MySQL>4.1 returns TIMESTAMP in the same format as DATETIME 93 # MySQL>4.1 returns TIMESTAMP in the same format as DATETIME
88 if s[4] == '-': return DateTime_or_None(s) 94 if s[4] == '-': return DateTime_or_None(s)