Hello community, here is the log from the commit of package python-mysqlclient for openSUSE:Factory checked in at 2019-11-29 15:55:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mysqlclient (Old) and /work/SRC/openSUSE:Factory/.python-mysqlclient.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-mysqlclient" Fri Nov 29 15:55:35 2019 rev:6 rq:750368 version:1.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-mysqlclient/python-mysqlclient.changes 2019-08-23 11:02:40.506522415 +0200 +++ /work/SRC/openSUSE:Factory/.python-mysqlclient.new.26869/python-mysqlclient.changes 2019-11-29 15:55:37.849015957 +0100 @@ -1,0 +2,8 @@ +Fri Nov 22 17:31:43 UTC 2019 - Alexei Podvalsky <avvissu@yandex.by> + +- Update to 1.4.6: + * The cp1252 encoding is used when charset is "latin1". (#390) +- Change in 1.4.5: + * The auth_plugin option is added. (#389) + +------------------------------------------------------------------- Old: ---- mysqlclient-1.4.4.tar.gz New: ---- mysqlclient-1.4.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mysqlclient.spec ++++++ --- /var/tmp/diff_new_pack.E6panm/_old 2019-11-29 15:55:38.533015564 +0100 +++ /var/tmp/diff_new_pack.E6panm/_new 2019-11-29 15:55:38.537015562 +0100 @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-mysqlclient -Version: 1.4.4 +Version: 1.4.6 Release: 0 Summary: Python interface to MySQL License: GPL-2.0-or-later ++++++ mysqlclient-1.4.4.tar.gz -> mysqlclient-1.4.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/HISTORY.rst new/mysqlclient-1.4.6/HISTORY.rst --- old/mysqlclient-1.4.4/HISTORY.rst 2019-08-11 17:34:01.000000000 +0200 +++ new/mysqlclient-1.4.6/HISTORY.rst 2019-11-21 13:36:29.000000000 +0100 @@ -1,4 +1,21 @@ ====================== + What's new in 1.4.6 +====================== + +Release: 2019-11-21 + +* The ``cp1252`` encoding is used when charset is "latin1". (#390) + +====================== + What's new in 1.4.5 +====================== + +Release: 2019-11-06 + +* The ``auth_plugin`` option is added. (#389) + + +====================== What's new in 1.4.4 ====================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/MySQLdb/__init__.py new/mysqlclient-1.4.6/MySQLdb/__init__.py --- old/mysqlclient-1.4.4/MySQLdb/__init__.py 2019-07-18 10:40:54.000000000 +0200 +++ new/mysqlclient-1.4.6/MySQLdb/__init__.py 2019-11-18 13:13:21.000000000 +0100 @@ -18,8 +18,8 @@ from . import _mysql if version_info != _mysql.version_info: - raise ImportError("this is MySQLdb version %s, but _mysql is version %r" % - (version_info, _mysql.version_info)) + raise ImportError("this is MySQLdb version %s, but _mysql is version %r\n_mysql: %r" % + (version_info, _mysql.version_info, _mysql.__file__)) threadsafety = 1 apilevel = "2.0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/MySQLdb/_mysql.c new/mysqlclient-1.4.6/MySQLdb/_mysql.c --- old/mysqlclient-1.4.4/MySQLdb/_mysql.c 2019-08-11 17:17:34.000000000 +0200 +++ new/mysqlclient-1.4.6/MySQLdb/_mysql.c 2019-11-19 09:28:43.000000000 +0100 @@ -217,6 +217,9 @@ if (strncmp(utf8, cs.csname, 4) == 0) { // utf8, utf8mb3, utf8mb4 return utf8; } + else if (strncmp("latin1", cs.csname, 6) == 0) { + return "cp1252"; + } else if (strncmp("koi8r", cs.csname, 5) == 0) { return "koi8_r"; } @@ -398,6 +401,7 @@ "client_flag", "ssl", "local_infile", "read_timeout", "write_timeout", "charset", + "auth_plugin", NULL } ; int connect_timeout = 0; int read_timeout = 0; @@ -406,13 +410,14 @@ char *init_command=NULL, *read_default_file=NULL, *read_default_group=NULL, - *charset=NULL; + *charset=NULL, + *auth_plugin=NULL; self->converter = NULL; self->open = 0; if (!PyArg_ParseTupleAndKeywords(args, kwargs, - "|ssssisOiiisssiOiiis:connect", + "|ssssisOiiisssiOiiiss:connect", kwlist, &host, &user, &passwd, &db, &port, &unix_socket, &conv, @@ -424,7 +429,8 @@ &local_infile, &read_timeout, &write_timeout, - &charset + &charset, + &auth_plugin )) return -1; @@ -491,6 +497,9 @@ if (charset) { mysql_options(&(self->connection), MYSQL_SET_CHARSET_NAME, charset); } + if (auth_plugin) { + mysql_options(&(self->connection), MYSQL_DEFAULT_AUTH, auth_plugin); + } conn = mysql_real_connect(&(self->connection), host, user, passwd, db, port, unix_socket, client_flag); @@ -2296,7 +2305,7 @@ }, { "server_capabilities", - T_UINT, + T_ULONG, offsetof(_mysql_ConnectionObject,connection.server_capabilities), READONLY, "Capabilities of server; consult MySQLdb.constants.CLIENT" @@ -2310,7 +2319,7 @@ }, { "client_flag", - T_UINT, + T_ULONG, offsetof(_mysql_ConnectionObject,connection.client_flag), READONLY, "Client flags; refer to MySQLdb.constants.CLIENT" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/MySQLdb/connections.py new/mysqlclient-1.4.6/MySQLdb/connections.py --- old/mysqlclient-1.4.4/MySQLdb/connections.py 2019-08-11 17:17:34.000000000 +0200 +++ new/mysqlclient-1.4.6/MySQLdb/connections.py 2019-11-19 09:28:43.000000000 +0100 @@ -15,6 +15,14 @@ NotSupportedError, ProgrammingError, ) +# Mapping from MySQL charset name to Python codec name +_charset_to_encoding = { + "utf8mb4": "utf8", + "utf8mb3": "utf8", + "latin1": "cp1252", + "koi8r": "koi8_r", + "koi8u": "koi8_u", +} re_numeric_part = re.compile(r"^(\d+)") @@ -86,6 +94,11 @@ On Python 2, this option changes default value of `use_unicode` option from False to True. + :param str auth_plugin: + If supplied, the connection default authentication plugin will be + changed to this value. Example values: + `mysql_native_password` or `caching_sha2_password` + :param str sql_mode: If supplied, the session SQL mode will be changed to this setting. @@ -284,10 +297,7 @@ set can only be changed in MySQL-4.1 and newer. If you try to change the character set from the current value in an older version, NotSupportedError will be raised.""" - if charset in ("utf8mb4", "utf8mb3"): - py_charset = "utf8" - else: - py_charset = charset + py_charset = _charset_to_encoding.get(charset, charset) if self.character_set_name() != charset: try: super(Connection, self).set_character_set(charset) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/MySQLdb/release.py new/mysqlclient-1.4.6/MySQLdb/release.py --- old/mysqlclient-1.4.4/MySQLdb/release.py 2019-08-11 17:36:07.000000000 +0200 +++ new/mysqlclient-1.4.6/MySQLdb/release.py 2019-11-21 13:37:13.000000000 +0100 @@ -1,4 +1,4 @@ __author__ = "Inada Naoki <songofacandy@gmail.com>" -version_info = (1,4,4,'final',0) -__version__ = "1.4.4" +version_info = (1,4,6,'final',0) +__version__ = "1.4.6" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/PKG-INFO new/mysqlclient-1.4.6/PKG-INFO --- old/mysqlclient-1.4.4/PKG-INFO 2019-08-11 17:36:07.000000000 +0200 +++ new/mysqlclient-1.4.6/PKG-INFO 2019-11-21 13:37:13.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: mysqlclient -Version: 1.4.4 +Version: 1.4.6 Summary: Python interface to MySQL Home-page: https://github.com/PyMySQL/mysqlclient-python Author: Inada Naoki @@ -23,7 +23,7 @@ * `sudo apt-get install python-dev default-libmysqlclient-dev` # Debian / Ubuntu * `sudo yum install python-devel mysql-devel` # Red Hat / CentOS - * `brew install mysql-connector-c` # macOS (Homebrew) (Currently, it has bug. See below) + * `brew install mysql-client` # macOS (Homebrew) On Windows, there are binary wheels you can install without MySQLConnector/C or MSVC. @@ -33,33 +33,6 @@ `sudo yum install python3-devel ` # Red Hat / CentOS - #### **Note about bug of MySQL Connector/C on macOS** - - See also: https://bugs.mysql.com/bug.php?id=86971 - - Versions of MySQL Connector/C may have incorrect default configuration options that cause compilation errors when `mysqlclient-python` is installed. (As of November 2017, this is known to be true for homebrew's `mysql-connector-c` and [official package](https://dev.mysql.com/downloads/connector/c/)) - - Modification of `mysql_config` resolves these issues as follows. - - Change - - ``` - # on macOS, on or about line 112: - # Create options - libs="-L$pkglibdir" - libs="$libs -l " - ``` - - to - - ``` - # Create options - libs="-L$pkglibdir" - libs="$libs -lmysqlclient -lssl -lcrypto" - ``` - - An improper ssl configuration may also create issues; see, e.g, `brew info openssl` for details on macOS. - ### Install from PyPI `pip install mysqlclient` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/README.md new/mysqlclient-1.4.6/README.md --- old/mysqlclient-1.4.4/README.md 2018-10-20 04:03:50.000000000 +0200 +++ new/mysqlclient-1.4.6/README.md 2019-11-19 09:28:43.000000000 +0100 @@ -15,7 +15,7 @@ * `sudo apt-get install python-dev default-libmysqlclient-dev` # Debian / Ubuntu * `sudo yum install python-devel mysql-devel` # Red Hat / CentOS -* `brew install mysql-connector-c` # macOS (Homebrew) (Currently, it has bug. See below) +* `brew install mysql-client` # macOS (Homebrew) On Windows, there are binary wheels you can install without MySQLConnector/C or MSVC. @@ -25,33 +25,6 @@ `sudo yum install python3-devel ` # Red Hat / CentOS -#### **Note about bug of MySQL Connector/C on macOS** - -See also: https://bugs.mysql.com/bug.php?id=86971 - -Versions of MySQL Connector/C may have incorrect default configuration options that cause compilation errors when `mysqlclient-python` is installed. (As of November 2017, this is known to be true for homebrew's `mysql-connector-c` and [official package](https://dev.mysql.com/downloads/connector/c/)) - -Modification of `mysql_config` resolves these issues as follows. - -Change - -``` -# on macOS, on or about line 112: -# Create options -libs="-L$pkglibdir" -libs="$libs -l " -``` - -to - -``` -# Create options -libs="-L$pkglibdir" -libs="$libs -lmysqlclient -lssl -lcrypto" -``` - -An improper ssl configuration may also create issues; see, e.g, `brew info openssl` for details on macOS. - ### Install from PyPI `pip install mysqlclient` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/doc/MySQLdb.rst new/mysqlclient-1.4.6/doc/MySQLdb.rst --- old/mysqlclient-1.4.4/doc/MySQLdb.rst 2018-12-05 10:43:29.000000000 +0100 +++ new/mysqlclient-1.4.6/doc/MySQLdb.rst 2019-11-19 09:27:19.000000000 +0100 @@ -41,6 +41,23 @@ :undoc-members: :show-inheritance: +:mod:`_mysql` Module +-------------------- + +.. automodule:: MySQLdb._mysql + :members: + :undoc-members: + :show-inheritance: + +:mod:`_exceptions` Module +------------------------- + +.. automodule:: MySQLdb._exceptions + :members: + :undoc-members: + :show-inheritance: + + Subpackages ----------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/doc/_exceptions.rst new/mysqlclient-1.4.6/doc/_exceptions.rst --- old/mysqlclient-1.4.4/doc/_exceptions.rst 2019-01-17 13:30:38.000000000 +0100 +++ new/mysqlclient-1.4.6/doc/_exceptions.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -_exceptions Module -======================== - -.. automodule:: MySQLdb._exceptions - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/doc/_mysql.rst new/mysqlclient-1.4.6/doc/_mysql.rst --- old/mysqlclient-1.4.4/doc/_mysql.rst 2019-01-17 13:30:38.000000000 +0100 +++ new/mysqlclient-1.4.6/doc/_mysql.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -_mysql Module -============= - -.. automodule:: MySQLdb._mysql - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/doc/conf.py new/mysqlclient-1.4.6/doc/conf.py --- old/mysqlclient-1.4.4/doc/conf.py 2018-12-05 10:43:45.000000000 +0100 +++ new/mysqlclient-1.4.6/doc/conf.py 2019-11-18 13:14:11.000000000 +0100 @@ -16,7 +16,7 @@ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -sys.path.insert(0, os.path.abspath('..')) +#sys.path.insert(0, os.path.abspath('..')) # -- General configuration ----------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/doc/modules.rst new/mysqlclient-1.4.6/doc/modules.rst --- old/mysqlclient-1.4.4/doc/modules.rst 2018-12-06 11:27:28.000000000 +0100 +++ new/mysqlclient-1.4.6/doc/modules.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -MySQLdb -======= - -.. toctree:: - :maxdepth: 4 - - MySQLdb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/doc/user_guide.rst new/mysqlclient-1.4.6/doc/user_guide.rst --- old/mysqlclient-1.4.4/doc/user_guide.rst 2019-07-18 10:40:54.000000000 +0200 +++ new/mysqlclient-1.4.6/doc/user_guide.rst 2019-11-19 09:21:32.000000000 +0100 @@ -546,7 +546,7 @@ Some examples ............. -The ``connect()`` method works nearly the same as with `_mysql`_:: +The ``connect()`` method works nearly the same as with `MySQLDB._mysql`_:: import MySQLdb db=MySQLdb.connect(passwd="moonpie",db="thangs") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/metadata.cfg new/mysqlclient-1.4.6/metadata.cfg --- old/mysqlclient-1.4.4/metadata.cfg 2019-08-11 17:35:01.000000000 +0200 +++ new/mysqlclient-1.4.6/metadata.cfg 2019-11-21 13:06:17.000000000 +0100 @@ -1,6 +1,6 @@ [metadata] -version: 1.4.4 -version_info: (1,4,4,'final',0) +version: 1.4.6 +version_info: (1,4,6,'final',0) description: Python interface to MySQL author: Inada Naoki author_email: songofacandy@gmail.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/mysqlclient.egg-info/PKG-INFO new/mysqlclient-1.4.6/mysqlclient.egg-info/PKG-INFO --- old/mysqlclient-1.4.4/mysqlclient.egg-info/PKG-INFO 2019-08-11 17:36:07.000000000 +0200 +++ new/mysqlclient-1.4.6/mysqlclient.egg-info/PKG-INFO 2019-11-21 13:37:13.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: mysqlclient -Version: 1.4.4 +Version: 1.4.6 Summary: Python interface to MySQL Home-page: https://github.com/PyMySQL/mysqlclient-python Author: Inada Naoki @@ -23,7 +23,7 @@ * `sudo apt-get install python-dev default-libmysqlclient-dev` # Debian / Ubuntu * `sudo yum install python-devel mysql-devel` # Red Hat / CentOS - * `brew install mysql-connector-c` # macOS (Homebrew) (Currently, it has bug. See below) + * `brew install mysql-client` # macOS (Homebrew) On Windows, there are binary wheels you can install without MySQLConnector/C or MSVC. @@ -33,33 +33,6 @@ `sudo yum install python3-devel ` # Red Hat / CentOS - #### **Note about bug of MySQL Connector/C on macOS** - - See also: https://bugs.mysql.com/bug.php?id=86971 - - Versions of MySQL Connector/C may have incorrect default configuration options that cause compilation errors when `mysqlclient-python` is installed. (As of November 2017, this is known to be true for homebrew's `mysql-connector-c` and [official package](https://dev.mysql.com/downloads/connector/c/)) - - Modification of `mysql_config` resolves these issues as follows. - - Change - - ``` - # on macOS, on or about line 112: - # Create options - libs="-L$pkglibdir" - libs="$libs -l " - ``` - - to - - ``` - # Create options - libs="-L$pkglibdir" - libs="$libs -lmysqlclient -lssl -lcrypto" - ``` - - An improper ssl configuration may also create issues; see, e.g, `brew info openssl` for details on macOS. - ### Install from PyPI `pip install mysqlclient` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysqlclient-1.4.4/mysqlclient.egg-info/SOURCES.txt new/mysqlclient-1.4.6/mysqlclient.egg-info/SOURCES.txt --- old/mysqlclient-1.4.4/mysqlclient.egg-info/SOURCES.txt 2019-08-11 17:36:07.000000000 +0200 +++ new/mysqlclient-1.4.6/mysqlclient.egg-info/SOURCES.txt 2019-11-21 13:37:13.000000000 +0100 @@ -27,11 +27,8 @@ doc/FAQ.rst doc/MySQLdb.constants.rst doc/MySQLdb.rst -doc/_exceptions.rst -doc/_mysql.rst doc/conf.py doc/index.rst -doc/modules.rst doc/user_guide.rst mysqlclient.egg-info/PKG-INFO mysqlclient.egg-info/SOURCES.txt