573 Commits

Author SHA1 Message Date
5a66f79f10 Fix segfault on Python 2. 2014-04-18 11:50:58 +09:00
f188e0f9e4 Fix some tests. 2014-04-18 11:29:10 +09:00
e8c1ebb5b7 Call decoders with unicode when field is not str and bytes. 2014-04-18 03:42:11 +09:00
b5780d29c9 self of module-level function is not NULL on Python 3. 2014-04-18 01:11:47 +09:00
c66b43cc22 Connection.literal() always returns str instance. 2014-04-17 22:36:01 +09:00
382fb9f9b3 Random fixes. 2014-04-17 22:24:46 +09:00
9cdef719a6 More fix 2014-04-17 19:50:42 +09:00
acc984c247 Fix escaping.
escape_string() -- only accepts bytes
string_literal() -- Use ASCII to encode str(o)
2014-04-17 19:41:01 +09:00
f8c046ecc8 .travis.yml: Add py33 and py34 but allow fail 2014-04-16 17:47:03 -07:00
9440a0d4df Handle types in a Python 3 friendly way 2014-04-16 14:31:10 -07:00
182011eb18 Merge branch 'remove_MySQLdb/release.py' into py3.3support 2014-04-16 10:55:35 -07:00
a7720be6d7 Merge branch 'support_py27_to_py34' into py3.3support 2014-04-16 10:51:31 -07:00
613762c87b Merge branch 'py3-capi' into py3.3support 2014-04-16 10:42:34 -07:00
c4d8948449 Remove more macros for ancient Python. 2014-04-17 01:13:43 +09:00
2556226b3e Cleanup
Remove macros for Python <2.6
2014-04-17 01:05:38 +09:00
80f5a4a66f Fix segfault on Python 2. 2014-04-17 00:44:43 +09:00
690e5e9325 Fix getattr on result object. 2014-04-16 23:33:17 +09:00
8b8444fd89 Fix memory corruption on Python 3. 2014-04-16 23:29:05 +09:00
5fc7131cc0 Some Python 3 C-API fixes. 2014-04-16 22:31:48 +09:00
7591a43949 tox.ini: Remove ipdb
It makes tests take longer to install deps and now causes this error on
Python < 2.7, because of IPython 2.0.0 requiring 2.7:

    ERROR: IPython requires Python Version 2.7 or above.
2014-04-15 12:32:44 -07:00
283299a08c Support Python 2.7, 3.3, 3.4
These are reasonably modern versions of Python that I think are worth
supporting for the planned 1.3.0 release.
2014-04-15 11:28:15 -07:00
4d61517963 Remove MySQLdb/release.py from git
because it's generated from metadata.cfg

and because I keep getting annoying diffs because of newline differences
-- e.g.:

    $ git diff
    diff --git a/MySQLdb/release.py b/MySQLdb/release.py
    index 5c30a6c..4ce9412 100644
    --- a/MySQLdb/release.py
    +++ b/MySQLdb/release.py
    @@ -1,4 +1,4 @@
    -
    -__author__ = "Andy Dustman <farcepest@gmail.com>"
    -version_info = (1,2,4,'final',1)
    -__version__ = "1.2.4"
    +
    +__author__ = "Andy Dustman <farcepest@gmail.com>"
    +version_info = (1,2,4,'final',1)
    +__version__ = "1.2.4"
2014-04-15 10:35:18 -07:00
0773933cae Changing the way checks for the error code are made. 2014-01-10 10:10:53 +01:00
b9aa0530a8 Improved support for Python 3. 2014-01-09 18:03:53 +01:00
d34fac6814 Merge pull request #44 from emonty/master
Stop using distribute
2014-01-02 10:42:36 -08:00
7dd57dcf5f Merge https://github.com/farcepest/MySQLdb1 into merge-upstream 2014-01-02 11:31:00 -06:00
b739fb06aa Remove distribute_setup.py reference in MANIFEST
We're not using it anymore, remove the setuptools warning about it not
existing.
2014-01-02 11:29:02 -06:00
5ce7d5f8a6 Merge pull request #29 from msabramo/tox
Add tox.ini for tox (http://tox.testrun.org/)
2013-11-21 13:36:48 -08:00
ed5e9e430d Update .travis.yml
It seems Travis no longer supports Python 2.5.
2013-11-21 15:07:08 -05:00
d236bb7f6b Merge pull request #26 from chipturner/master
Extend read_timeout support to also include write_timeouts
2013-11-21 12:00:56 -08:00
002bbb8cd6 Merge pull request #30 from msabramo/assertEquals
Change one assertTrue to assertEquals to get better failure output
2013-11-21 11:59:13 -08:00
95ae115c7d Merge pull request #32 from methane/autocommit
More precise get_autocommit based on server_status.
2013-11-21 11:57:32 -08:00
9b0b59f1bb Merge pull request #34 from tyzhnenko/test-and-fix-issue-33
Fix cut off SQL query when its contained `))`
2013-11-21 11:55:10 -08:00
76037a2703 Merge pull request #35 from methane/static
remove -lmysqlclient when static linking.
2013-11-21 11:53:34 -08:00
44f8b4d2b9 Merge pull request #36 from Multiposting/master
Fix the conversion of list or tuple args to SQL.
2013-11-21 11:52:42 -08:00
a7c3ce49fc Merge pull request #38 from olive-oasis/master
microsecond-bug-fix for datetime.datetime
2013-11-21 11:46:46 -08:00
fb1c79d85a microsecond-bug-fix
When the MySQL Datetime Fraction is less than 6, microseconds set
incorrectly. For example, you set the field, Datetime(3). Then this
library read the time `2013-11-07 10:27:35.705` as `2013-11-08
10:27:35.000705`.
2013-11-08 12:18:55 +09:00
100485f627 microsecond-bug-fix for datetime.datetime 2013-11-08 11:51:31 +09:00
8096d8c053 Also fix executemany(). 2013-11-05 11:34:43 +01:00
8bef3359fb Syntax fix for python 2.5 support. 2013-11-05 11:01:22 +01:00
87d1145c0d Fix the conversion of list or tuple args to a SQL.
When there is one element on the list, the generated SQL was
(1,) (python notation of a single element tuple, which is not
valid in SQL.
2013-11-04 16:17:57 +01:00
0beb712e4b remove -lmysqlclient when static linking. 2013-10-25 18:29:15 +09:00
052955e093 Fix cut off SQL query when its contained )), edit insert_values
regexp. Fixes issue #33.
2013-10-07 12:35:13 +03:00
2204283605 Remove unused variable. 2013-10-02 02:17:48 +09:00
3dbf035fa5 More precise get_autocommit based on server_status. 2013-10-02 02:10:02 +09:00
a1dd63614f tox.ini: Add ipdb as a dep because it's very useful for debugging 2013-09-30 16:24:18 -07:00
53ebb0fced Change one assertTrue to assertEquals to get better failure output 2013-09-30 13:51:30 -07:00
e20b631d16 Add support for tox 2013-09-30 09:27:48 -07:00
7e73533dd9 Extend read_timeout support to also include write_timeouts 2013-08-23 13:10:07 -07:00
c8b2744ea2 Merge pull request #12 from KLab/autocommit_on
Support keyword argument to initially autocommit=on
2013-08-18 14:22:40 -07:00