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

* Fix pytimes.TimeDelta_or_None()

Browse Source 
* Include days with mxdatetime.format_TIME()

 * Return MySQL TIME columns as a time delta

 * Remove old CompatMysqldb module

 * Version 1.1.6
This commit is contained in:
adustman
2004-09-26 22:22:59 +00:00
parent f6d529758d
commit b624fd4bdd
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MySQLdb/MySQLdb/__init__.py
View File

@ -18,7 +18,7 @@ __revision__ = """$Revision$"""[11:-2]
version_info = ( version_info = (
1, 1,
1, 1,
5, 6,
"final", "final",
1) 1)
if version_info[3] == "final": __version__ = "%d.%d.%d" % version_info[:3] if version_info[3] == "final": __version__ = "%d.%d.%d" % version_info[:3]

2
MySQLdb/MySQLdb/converters.py
View File

@ -125,7 +125,7 @@ conversions = {
FIELD_TYPE.SET: Str2Set, FIELD_TYPE.SET: Str2Set,
FIELD_TYPE.TIMESTAMP: mysql_timestamp_converter, FIELD_TYPE.TIMESTAMP: mysql_timestamp_converter,
FIELD_TYPE.DATETIME: DateTime_or_None, FIELD_TYPE.DATETIME: DateTime_or_None,
FIELD_TYPE.TIME: Time_or_None, FIELD_TYPE.TIME: TimeDelta_or_None,
FIELD_TYPE.DATE: Date_or_None, FIELD_TYPE.DATE: Date_or_None,
FIELD_TYPE.BLOB: [ FIELD_TYPE.BLOB: [
(FLAG.BINARY, char_array), (FLAG.BINARY, char_array),

2
MySQLdb/MySQLdb/mxdatetimes.py
View File

@ -29,7 +29,7 @@ def format_DATE(d):
def format_TIME(d): def format_TIME(d):
"""Format a DateTime object as a time value.""" """Format a DateTime object as a time value."""
return d.strftime("%H:%M:%S") return d.strftime("%d %H:%M:%S")
def format_TIMESTAMP(d): def format_TIMESTAMP(d):
"""Format a DateTime object as an ISO timestamp.""" """Format a DateTime object as an ISO timestamp."""

2
MySQLdb/MySQLdb/pytimes.py
View File

@ -50,7 +50,7 @@ def TimeDelta_or_None(s):
try: try:
h, m, s = s.split(':') h, m, s = s.split(':')
td = timedelta(hours=int(h), minutes=int(m), seconds=int(s), td = timedelta(hours=int(h), minutes=int(m), seconds=int(s),
microseconds=int(modf(float(s)[0]))*1000000) microseconds=int(modf(float(s))[0])*1000000)
if h < 0: if h < 0:
return -td return -td
else: else:

6
MySQLdb/_mysql.c
View File

@ -1,5 +1,5 @@
#define version_info "(1,1,5,'final',1)" #define version_info "(1,1,6,'final',1)"
#define __version__ "1.1.5" #define __version__ "1.1.6"
/* /*
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -427,8 +427,10 @@ _mysql_ConnectionObject_Initialize(
PyObject *conv = NULL; PyObject *conv = NULL;
PyObject *ssl = NULL; PyObject *ssl = NULL;
PyObject *value = NULL; PyObject *value = NULL;
#if HAVE_OPENSSL
char *key = NULL, *cert = NULL, *ca = NULL, char *key = NULL, *cert = NULL, *ca = NULL,
*capath = NULL, *cipher = NULL; *capath = NULL, *cipher = NULL;
#endif
char *host = NULL, *user = NULL, *passwd = NULL, char *host = NULL, *user = NULL, *passwd = NULL,
*db = NULL, *unix_socket = NULL; *db = NULL, *unix_socket = NULL;
uint port = MYSQL_PORT; uint port = MYSQL_PORT;

4
MySQLdb/setup.py
View File

@ -18,7 +18,7 @@ embedded_server = (mysqlclient == 'mysqld')
name = "MySQL-%s" % os.path.basename(sys.executable) name = "MySQL-%s" % os.path.basename(sys.executable)
if embedded_server: if embedded_server:
name = name + "-embedded" name = name + "-embedded"
version = "1.1.5" version = "1.1.6"
# include files and library locations should cover most platforms # include files and library locations should cover most platforms
include_dirs = [ include_dirs = [
@ -120,7 +120,7 @@ setup (# Distribution meta-data
# Description of the modules and packages in the distribution # Description of the modules and packages in the distribution
py_modules = ["CompatMysqldb", py_modules = [
"_mysql_exceptions", "_mysql_exceptions",
"MySQLdb.converters", "MySQLdb.converters",
"MySQLdb.connections", "MySQLdb.connections",