[Python-modules-commits] [mysql-connector-python] 04/09: merge patched into master

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository mysql-connector-python.

commit 683dcb26b439f5e6e808af9c9a8d95b0dae71543
Merge: f3bf875 e07fecd
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Jun 17 20:23:52 2016 +0100

    merge patched into master

 CHANGES.txt                                        |   92 +-
 MANIFEST.in                                        |    1 +
 PKG-INFO                                           |    2 +-
 README.txt                                         |    2 +-
 debian/.git-dpm                                    |    6 +-
 examples/microseconds.py                           |   24 +-
 examples/warnings.py                               |   13 +-
 lib/cpy_distutils.py                               |  582 +++++
 lib/mysql/connector/__init__.py                    |   31 +-
 lib/mysql/connector/abstracts.py                   | 1161 +++++++++
 lib/mysql/connector/authentication.py              |    4 +-
 lib/mysql/connector/catch23.py                     |   31 +-
 lib/mysql/connector/charsets.py                    |    6 +-
 lib/mysql/connector/connection.py                  |  802 +-----
 lib/mysql/connector/connection_cext.py             |  593 +++++
 lib/mysql/connector/constants.py                   |   60 +-
 lib/mysql/connector/conversion.py                  |   95 +-
 lib/mysql/connector/cursor.py                      |  170 +-
 lib/mysql/connector/cursor_cext.py                 |  810 ++++++
 lib/mysql/connector/django/base.py                 |  523 ++--
 lib/mysql/connector/django/client.py               |   26 +-
 lib/mysql/connector/django/compiler.py             |   35 +-
 lib/mysql/connector/django/creation.py             |   72 +-
 lib/mysql/connector/django/features.py             |  127 +
 lib/mysql/connector/django/introspection.py        |  193 +-
 lib/mysql/connector/django/operations.py           |  308 +++
 lib/mysql/connector/django/schema.py               |   37 +-
 lib/mysql/connector/django/validation.py           |    9 +-
 lib/mysql/connector/errorcode.py                   |  222 +-
 lib/mysql/connector/errors.py                      |   16 +-
 lib/mysql/connector/fabric/__init__.py             |    6 -
 lib/mysql/connector/fabric/caching.py              |    4 +-
 lib/mysql/connector/fabric/connection.py           |  419 +++-
 lib/mysql/connector/locales/eng/client_error.py    |    9 +-
 lib/mysql/connector/optionfiles.py                 |    4 +-
 lib/mysql/connector/pooling.py                     |    1 -
 lib/mysql/connector/protocol.py                    |   35 +-
 lib/mysql/connector/version.py                     |    2 +-
 setup.py                                           |    5 +-
 setupinfo.py                                       |   28 +-
 src/exceptions.c                                   |  211 ++
 .../version.py => src/force_cpp_linkage.cc         |   24 +-
 src/include/catch23.h                              |   91 +
 .../version.py => src/include/exceptions.h         |   22 +-
 src/include/mysql_capi.h                           |  222 ++
 .../include/mysql_capi_conversion.h                |   98 +-
 .../version.py => src/include/mysql_connector.h    |   24 +-
 src/mysql_capi.c                                   | 2601 ++++++++++++++++++++
 src/mysql_capi_conversion.c                        |  763 ++++++
 src/mysql_connector.c                              |  340 +++
 tests/__init__.py                                  |  322 ++-
 tests/cext/__init__.py                             |    0
 tests/cext/test_cext_api.py                        |  763 ++++++
 tests/cext/test_cext_connection.py                 |  115 +
 tests/cext/test_cext_cursor.py                     |  573 +++++
 tests/mysqld.py                                    |  115 +-
 tests/test_abstracts.py                            |  281 +++
 tests/test_authentication.py                       |    6 +-
 tests/test_bugs.py                                 | 2042 +++++++++------
 tests/test_connection.py                           |  379 +--
 tests/test_constants.py                            |   41 +-
 tests/test_cursor.py                               |   30 +-
 tests/test_django.py                               |   76 +-
 tests/test_examples.py                             |   60 +-
 tests/test_fabric.py                               |   20 +-
 tests/test_mysql_datatypes.py                      |  110 +-
 tests/test_network.py                              |    4 -
 tests/test_pep249.py                               |   14 +-
 tests/test_protocol.py                             |    9 +-
 unittests.py                                       |  109 +-
 70 files changed, 13230 insertions(+), 2801 deletions(-)

diff --cc debian/.git-dpm
index 41b5149,0000000..cf322fb
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- b205ef5314fee6d15e4ae2d58d65b2bd4e765f4d
- b205ef5314fee6d15e4ae2d58d65b2bd4e765f4d
- 965bb758cf4f7127e044a10d6d10554901a0dfdb
++e07fecd08fbb0adb43a55d83a086901d3d7f86e6
++e07fecd08fbb0adb43a55d83a086901d3d7f86e6
++e07fecd08fbb0adb43a55d83a086901d3d7f86e6
 +e07fecd08fbb0adb43a55d83a086901d3d7f86e6
 +mysql-connector-python_2.1.3.orig.tar.gz
 +98e54a58505bcedcd561ffcf4a26cd133a54818a
 +271939
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/mysql-connector-python.git