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 in changes from the trunk

Browse Source
This commit is contained in:
adustman
2005-04-03 04:23:18 +00:00
parent 92fb64114b
commit a4892cd07e
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MySQLdb/MySQLdb/__init__.py
View File

@ -17,8 +17,8 @@ __author__ = "Andy Dustman <andy@dustman.net>"
__revision__ = """$Revision$"""[11:-2] __revision__ = """$Revision$"""[11:-2]
version_info = ( version_info = (
1, 1,
1, 2,
10, 0,
"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]

7
MySQLdb/MySQLdb/converters.py
View File

@ -147,3 +147,10 @@ try:
conversions[FIELD_TYPE.DECIMAL] = Decimal conversions[FIELD_TYPE.DECIMAL] = Decimal
except ImportError: except ImportError:
pass pass
try:
from types import BooleanType
def Bool2Str(s, d): return str(int(s))
conversions[BooleanType] = Bool2Str
except ImportError:
pass

4
MySQLdb/README
View File

@ -128,8 +128,8 @@ or you want to use the embedded server (mysqld).
Finally, putting it together:: Finally, putting it together::
$ tar xfz MySQL-python-1.1.10.tar.gz $ tar xfz MySQL-python-1.2.0.tar.gz
$ cd MySQL-python-1.1.10 $ cd MySQL-python-1.2.0
$ python setup.py build $ python setup.py build
$ su # or use sudo $ su # or use sudo
# python setup.py install # python setup.py install

4
MySQLdb/_mysql.c
View File

@ -1,5 +1,5 @@
#define version_info "(1,1,10,'final',1)" #define version_info "(1,2,0,'final',1)"
#define __version__ "1.1.10" #define __version__ "1.2.0"
/* /*
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

9
MySQLdb/setup.py
View File

@ -37,7 +37,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.10" version = "1.2.0"
extra_objects = [] extra_objects = []
@ -62,9 +62,12 @@ else:
def config(what): def config(what):
from os import popen from os import popen
return popen("mysql_config --%s" % what).read().strip().split() f = popen("mysql_config --%s" % what)
data = f.read().strip().split()
if f.close(): data = []
return data
include_dirs = [ i[2:] for i in config('include') ] include_dirs = [ i[2:] for i in config('include') if i.startswith('-i') ]
if mysqlclient == "mysqlclient": if mysqlclient == "mysqlclient":
libs = config("libs") libs = config("libs")