mysqlclient 2.2.3__tar.gz → 2.2.5__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/HISTORY.rst +20 -1
  2. {mysqlclient-2.2.3/src/mysqlclient.egg-info → mysqlclient-2.2.5}/PKG-INFO +8 -6
  3. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/README.md +4 -3
  4. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/doc/user_guide.rst +2 -2
  5. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/pyproject.toml +3 -2
  6. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/setup.py +1 -1
  7. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/_mysql.c +24 -12
  8. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/connections.py +2 -0
  9. mysqlclient-2.2.5/src/MySQLdb/release.py +3 -0
  10. {mysqlclient-2.2.3 → mysqlclient-2.2.5/src/mysqlclient.egg-info}/PKG-INFO +8 -6
  11. mysqlclient-2.2.3/src/MySQLdb/release.py +0 -3
  12. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/LICENSE +0 -0
  13. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/MANIFEST.in +0 -0
  14. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/doc/FAQ.rst +0 -0
  15. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/doc/MySQLdb.constants.rst +0 -0
  16. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/doc/MySQLdb.rst +0 -0
  17. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/doc/conf.py +0 -0
  18. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/doc/index.rst +0 -0
  19. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/setup.cfg +0 -0
  20. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/site.cfg +0 -0
  21. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/__init__.py +0 -0
  22. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/_exceptions.py +0 -0
  23. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/constants/CLIENT.py +0 -0
  24. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/constants/CR.py +0 -0
  25. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/constants/ER.py +0 -0
  26. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/constants/FIELD_TYPE.py +0 -0
  27. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/constants/FLAG.py +0 -0
  28. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/constants/__init__.py +0 -0
  29. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/converters.py +0 -0
  30. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/cursors.py +0 -0
  31. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/MySQLdb/times.py +0 -0
  32. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/mysqlclient.egg-info/SOURCES.txt +0 -0
  33. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/mysqlclient.egg-info/dependency_links.txt +0 -0
  34. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/src/mysqlclient.egg-info/top_level.txt +0 -0
  35. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/capabilities.py +0 -0
  36. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/configdb.py +0 -0
  37. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/dbapi20.py +0 -0
  38. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/test_MySQLdb_capabilities.py +0 -0
  39. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/test_MySQLdb_dbapi20.py +0 -0
  40. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/test_MySQLdb_nonstandard.py +0 -0
  41. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/test_MySQLdb_times.py +0 -0
  42. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/test__mysql.py +0 -0
  43. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/test_connection.py +0 -0
  44. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/test_cursor.py +0 -0
  45. {mysqlclient-2.2.3 → mysqlclient-2.2.5}/tests/test_errors.py +0 -0
@@ -1,3 +1,23 @@
1
+ ======================
2
+ What's new in 2.2.5
3
+ ======================
4
+
5
+ Release: 2024-10-20
6
+
7
+ * (Windows wheel) Update MariaDB Connector/C to 3.4.1. #726
8
+ * (Windows wheel) Build wheels for Python 3.13. #726
9
+
10
+ ======================
11
+ What's new in 2.2.4
12
+ ======================
13
+
14
+ Release: 2024-02-09
15
+
16
+ * Support ``ssl=True`` in ``connect()``. (#700)
17
+ This makes better compatibility with PyMySQL and mysqlclient==2.2.1
18
+ with libmariadb. See #698 for detail.
19
+
20
+
1
21
  ======================
2
22
  What's new in 2.2.3
3
23
  ======================
@@ -622,4 +642,3 @@ ursor.fetchXXXDict() methods raise DeprecationWarning
622
642
  cursor.begin() is making a brief reappearence.
623
643
 
624
644
  cursor.callproc() now works, with some limitations.
625
-
@@ -1,15 +1,15 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mysqlclient
3
- Version: 2.2.3
3
+ Version: 2.2.5
4
4
  Summary: Python interface to MySQL
5
5
  Author-email: Inada Naoki <songofacandy@gmail.com>
6
- License: GNU General Public License v2 (GPLv2)
6
+ License: GNU General Public License v2 or later (GPLv2+)
7
7
  Project-URL: Project, https://github.com/PyMySQL/mysqlclient
8
8
  Project-URL: Documentation, https://mysqlclient.readthedocs.io/
9
9
  Keywords: MySQL
10
10
  Classifier: Development Status :: 5 - Production/Stable
11
11
  Classifier: Environment :: Other Environment
12
- Classifier: License :: OSI Approved :: GNU General Public License (GPL)
12
+ Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
13
13
  Classifier: Operating System :: MacOS :: MacOS X
14
14
  Classifier: Operating System :: Microsoft :: Windows :: Windows NT/2000
15
15
  Classifier: Operating System :: OS Independent
@@ -24,6 +24,7 @@ Classifier: Programming Language :: Python :: 3.9
24
24
  Classifier: Programming Language :: Python :: 3.10
25
25
  Classifier: Programming Language :: Python :: 3.11
26
26
  Classifier: Programming Language :: Python :: 3.12
27
+ Classifier: Programming Language :: Python :: 3.13
27
28
  Classifier: Topic :: Database
28
29
  Classifier: Topic :: Database :: Database Engines/Servers
29
30
  Requires-Python: >=3.8
@@ -43,14 +44,15 @@ This project adds Python 3 support and fixed many bugs.
43
44
 
44
45
  **Do Not use Github Issue Tracker to ask help. OSS Maintainer is not free tech support**
45
46
 
46
- When your question looks relating to Python rather than MySQL:
47
+ When your question looks relating to Python rather than MySQL/MariaDB:
47
48
 
48
49
  * Python mailing list [python-list](https://mail.python.org/mailman/listinfo/python-list)
49
50
  * Slack [pythondev.slack.com](https://pyslackers.com/web/slack)
50
51
 
51
- Or when you have question about MySQL:
52
+ Or when you have question about MySQL/MariaDB:
52
53
 
53
- * [MySQL Community on Slack](https://lefred.be/mysql-community-on-slack/)
54
+ * [MySQL Support](https://dev.mysql.com/support/)
55
+ * [Getting Help With MariaDB](https://mariadb.com/kb/en/getting-help-with-mariadb/)
54
56
 
55
57
 
56
58
  ## Install
@@ -11,14 +11,15 @@ This project adds Python 3 support and fixed many bugs.
11
11
 
12
12
  **Do Not use Github Issue Tracker to ask help. OSS Maintainer is not free tech support**
13
13
 
14
- When your question looks relating to Python rather than MySQL:
14
+ When your question looks relating to Python rather than MySQL/MariaDB:
15
15
 
16
16
  * Python mailing list [python-list](https://mail.python.org/mailman/listinfo/python-list)
17
17
  * Slack [pythondev.slack.com](https://pyslackers.com/web/slack)
18
18
 
19
- Or when you have question about MySQL:
19
+ Or when you have question about MySQL/MariaDB:
20
20
 
21
- * [MySQL Community on Slack](https://lefred.be/mysql-community-on-slack/)
21
+ * [MySQL Support](https://dev.mysql.com/support/)
22
+ * [Getting Help With MariaDB](https://mariadb.com/kb/en/getting-help-with-mariadb/)
22
23
 
23
24
 
24
25
  ## Install
@@ -8,8 +8,8 @@ MySQLdb User's Guide
8
8
  Introduction
9
9
  ------------
10
10
 
11
- MySQLdb is an interface to the popular MySQL
12
- database server that provides the Python database API.
11
+ MySQLdb is an interface to the popular MySQL or MariaDB
12
+ database servers that provides the Python database API.
13
13
 
14
14
  Installation
15
15
  ------------
@@ -7,12 +7,12 @@ requires-python = ">=3.8"
7
7
  authors = [
8
8
  {name = "Inada Naoki", email = "songofacandy@gmail.com"}
9
9
  ]
10
- license = {text = "GNU General Public License v2 (GPLv2)"}
10
+ license = {text = "GNU General Public License v2 or later (GPLv2+)"}
11
11
  keywords = ["MySQL"]
12
12
  classifiers = [
13
13
  "Development Status :: 5 - Production/Stable",
14
14
  "Environment :: Other Environment",
15
- "License :: OSI Approved :: GNU General Public License (GPL)",
15
+ "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
16
16
  "Operating System :: MacOS :: MacOS X",
17
17
  "Operating System :: Microsoft :: Windows :: Windows NT/2000",
18
18
  "Operating System :: OS Independent",
@@ -27,6 +27,7 @@ classifiers = [
27
27
  "Programming Language :: Python :: 3.10",
28
28
  "Programming Language :: Python :: 3.11",
29
29
  "Programming Language :: Python :: 3.12",
30
+ "Programming Language :: Python :: 3.13",
30
31
  "Topic :: Database",
31
32
  "Topic :: Database :: Database Engines/Servers",
32
33
  ]
@@ -15,7 +15,7 @@ with open("src/MySQLdb/release.py", encoding="utf-8") as f:
15
15
  def find_package_name():
16
16
  """Get available pkg-config package name"""
17
17
  # Ubuntu uses mariadb.pc, but CentOS uses libmariadb.pc
18
- packages = ["mysqlclient", "mariadb", "libmariadb"]
18
+ packages = ["mysqlclient", "mariadb", "libmariadb", "perconaserverclient"]
19
19
  for pkg in packages:
20
20
  try:
21
21
  cmd = f"pkg-config --exists {pkg}"
@@ -391,10 +391,10 @@ enum {
391
391
  };
392
392
 
393
393
  static int
394
- _get_ssl_mode_num(char *ssl_mode)
394
+ _get_ssl_mode_num(const char *ssl_mode)
395
395
  {
396
- static char *ssl_mode_list[] = { "DISABLED", "PREFERRED",
397
- "REQUIRED", "VERIFY_CA", "VERIFY_IDENTITY" };
396
+ static const char *ssl_mode_list[] = {
397
+ "DISABLED", "PREFERRED", "REQUIRED", "VERIFY_CA", "VERIFY_IDENTITY" };
398
398
  unsigned int i;
399
399
  for (i=0; i < sizeof(ssl_mode_list)/sizeof(ssl_mode_list[0]); i++) {
400
400
  if (strcmp(ssl_mode, ssl_mode_list[i]) == 0) {
@@ -414,7 +414,7 @@ _mysql_ConnectionObject_Initialize(
414
414
  MYSQL *conn = NULL;
415
415
  PyObject *conv = NULL;
416
416
  PyObject *ssl = NULL;
417
- char *ssl_mode = NULL;
417
+ const char *ssl_mode = NULL;
418
418
  const char *key = NULL, *cert = NULL, *ca = NULL,
419
419
  *capath = NULL, *cipher = NULL;
420
420
  PyObject *ssl_keepref[5] = {NULL};
@@ -437,7 +437,7 @@ _mysql_ConnectionObject_Initialize(
437
437
  int read_timeout = 0;
438
438
  int write_timeout = 0;
439
439
  int compress = -1, named_pipe = -1, local_infile = -1;
440
- int ssl_mode_num = SSLMODE_DISABLED;
440
+ int ssl_mode_num = SSLMODE_PREFERRED;
441
441
  char *init_command=NULL,
442
442
  *read_default_file=NULL,
443
443
  *read_default_group=NULL,
@@ -470,19 +470,31 @@ _mysql_ConnectionObject_Initialize(
470
470
  if(t){d=PyUnicode_AsUTF8(t);ssl_keepref[n_ssl_keepref++]=t;}\
471
471
  PyErr_Clear();}
472
472
 
473
+ char ssl_mode_set = 0;
473
474
  if (ssl) {
474
- PyObject *value = NULL;
475
- _stringsuck(ca, value, ssl);
476
- _stringsuck(capath, value, ssl);
477
- _stringsuck(cert, value, ssl);
478
- _stringsuck(key, value, ssl);
479
- _stringsuck(cipher, value, ssl);
475
+ if (PyMapping_Check(ssl)) {
476
+ PyObject *value = NULL;
477
+ _stringsuck(ca, value, ssl);
478
+ _stringsuck(capath, value, ssl);
479
+ _stringsuck(cert, value, ssl);
480
+ _stringsuck(key, value, ssl);
481
+ _stringsuck(cipher, value, ssl);
482
+ } else if (PyObject_IsTrue(ssl)) {
483
+ // Support ssl=True from mysqlclient 2.2.4.
484
+ // for compatibility with PyMySQL and mysqlclient==2.2.1&libmariadb.
485
+ ssl_mode_num = SSLMODE_REQUIRED;
486
+ ssl_mode_set = 1;
487
+ } else {
488
+ ssl_mode_num = SSLMODE_DISABLED;
489
+ ssl_mode_set = 1;
490
+ }
480
491
  }
481
492
  if (ssl_mode) {
482
493
  if ((ssl_mode_num = _get_ssl_mode_num(ssl_mode)) <= 0) {
483
494
  PyErr_SetString(_mysql_NotSupportedError, "Unknown ssl_mode specification");
484
495
  return -1;
485
496
  }
497
+ ssl_mode_set = 1;
486
498
  }
487
499
 
488
500
  conn = mysql_init(&(self->connection));
@@ -531,7 +543,7 @@ _mysql_ConnectionObject_Initialize(
531
543
  mysql_options(&(self->connection), MYSQL_OPT_SSL_CIPHER, cipher);
532
544
  }
533
545
 
534
- if (ssl_mode) {
546
+ if (ssl_mode_set) {
535
547
  #ifdef HAVE_ENUM_MYSQL_OPT_SSL_MODE
536
548
  mysql_options(&(self->connection), MYSQL_OPT_SSL_MODE, &ssl_mode_num);
537
549
  #else
@@ -134,6 +134,8 @@ class Connection(_mysql.connection):
134
134
  see the MySQL documentation for more details
135
135
  (mysql_ssl_set()). If this is set, and the client does not
136
136
  support SSL, NotSupportedError will be raised.
137
+ Since mysqlclient 2.2.4, ssl=True is alias of ssl_mode=REQUIRED
138
+ for better compatibility with PyMySQL and MariaDB.
137
139
 
138
140
  :param bool local_infile:
139
141
  enables LOAD LOCAL INFILE; zero disables
@@ -0,0 +1,3 @@
1
+ __author__ = "Inada Naoki <songofacandy@gmail.com>"
2
+ __version__ = "2.2.5"
3
+ version_info = (2, 2, 5, "final", 0)
@@ -1,15 +1,15 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mysqlclient
3
- Version: 2.2.3
3
+ Version: 2.2.5
4
4
  Summary: Python interface to MySQL
5
5
  Author-email: Inada Naoki <songofacandy@gmail.com>
6
- License: GNU General Public License v2 (GPLv2)
6
+ License: GNU General Public License v2 or later (GPLv2+)
7
7
  Project-URL: Project, https://github.com/PyMySQL/mysqlclient
8
8
  Project-URL: Documentation, https://mysqlclient.readthedocs.io/
9
9
  Keywords: MySQL
10
10
  Classifier: Development Status :: 5 - Production/Stable
11
11
  Classifier: Environment :: Other Environment
12
- Classifier: License :: OSI Approved :: GNU General Public License (GPL)
12
+ Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
13
13
  Classifier: Operating System :: MacOS :: MacOS X
14
14
  Classifier: Operating System :: Microsoft :: Windows :: Windows NT/2000
15
15
  Classifier: Operating System :: OS Independent
@@ -24,6 +24,7 @@ Classifier: Programming Language :: Python :: 3.9
24
24
  Classifier: Programming Language :: Python :: 3.10
25
25
  Classifier: Programming Language :: Python :: 3.11
26
26
  Classifier: Programming Language :: Python :: 3.12
27
+ Classifier: Programming Language :: Python :: 3.13
27
28
  Classifier: Topic :: Database
28
29
  Classifier: Topic :: Database :: Database Engines/Servers
29
30
  Requires-Python: >=3.8
@@ -43,14 +44,15 @@ This project adds Python 3 support and fixed many bugs.
43
44
 
44
45
  **Do Not use Github Issue Tracker to ask help. OSS Maintainer is not free tech support**
45
46
 
46
- When your question looks relating to Python rather than MySQL:
47
+ When your question looks relating to Python rather than MySQL/MariaDB:
47
48
 
48
49
  * Python mailing list [python-list](https://mail.python.org/mailman/listinfo/python-list)
49
50
  * Slack [pythondev.slack.com](https://pyslackers.com/web/slack)
50
51
 
51
- Or when you have question about MySQL:
52
+ Or when you have question about MySQL/MariaDB:
52
53
 
53
- * [MySQL Community on Slack](https://lefred.be/mysql-community-on-slack/)
54
+ * [MySQL Support](https://dev.mysql.com/support/)
55
+ * [Getting Help With MariaDB](https://mariadb.com/kb/en/getting-help-with-mariadb/)
54
56
 
55
57
 
56
58
  ## Install
@@ -1,3 +0,0 @@
1
- __author__ = "Inada Naoki <songofacandy@gmail.com>"
2
- __version__ = "2.2.3"
3
- version_info = (2, 2, 3, "final", 0)
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes