Merge pull request github#6077 from RasmusWL/fix-pypi-names

Python: Fixup for names of supported PyPI packages

Author: tausbn

docs/codeql/support/reusables/frameworks.rst

@@ -166,7 +166,8 @@ Python built-in support
    multidict, Utility library
    yarl, Utility library
    mysql-connector-python, Database
-   MySQLdb, Database
+   mysql-connector, Database
+   MySQL-python, Database
    psycopg2, Database
    sqlite3, Database
    cryptography, Cryptography library

python/ql/src/semmle/python/Frameworks.qll

@@ -14,7 +14,7 @@ private import semmle.python.frameworks.Flask
 private import semmle.python.frameworks.Idna
 private import semmle.python.frameworks.Invoke
 private import semmle.python.frameworks.Multidict
-private import semmle.python.frameworks.MysqlConnectorPython
+private import semmle.python.frameworks.Mysql
 private import semmle.python.frameworks.MySQLdb
 private import semmle.python.frameworks.Psycopg2
 private import semmle.python.frameworks.PyMySQL

python/ql/src/semmle/python/frameworks/MySQLdb.qll

@@ -1,5 +1,7 @@
 /**
- * Provides classes modeling security-relevant aspects of the `MySQLdb` PyPI package.
+ * Provides classes modeling security-relevant aspects of the `MySQL-python` PyPI package
+ * (imported as `MySQLdb`).
+ *
  * See
  * - https://mysqlclient.readthedocs.io/index.html
  * - https://pypi.org/project/MySQL-python/
@@ -13,7 +15,7 @@ private import semmle.python.ApiGraphs
 private import semmle.python.frameworks.PEP249
 
 /**
- * Provides models for the `MySQLdb` PyPI package.
+ * Provides models for the `MySQL-python` PyPI package (imported as `MySQLdb`).
  * See
  * - https://mysqlclient.readthedocs.io/index.html
  * - https://pypi.org/project/MySQL-python/

python/ql/src/semmle/python/frameworks/MysqlConnectorPython.qll renamed to python/ql/src/semmle/python/frameworks/Mysql.qll

@@ -1,5 +1,6 @@
 /**
- * Provides classes modeling security-relevant aspects of the `mysql-connector-python` package.
+ * Provides classes modeling security-relevant aspects of the `mysql-connector-python`
+ * and `mysql-connector` (old package name) PyPI packages (imported as `mysql`).
  * See
  * - https://dev.mysql.com/doc/connector-python/en/
  * - https://dev.mysql.com/doc/connector-python/en/connector-python-example-connecting.html
@@ -13,12 +14,13 @@ private import semmle.python.ApiGraphs
 private import semmle.python.frameworks.PEP249
 
 /**
- * Provides models for the `mysql-connector-python` package.
+ * Provides classes modeling security-relevant aspects of the `mysql-connector-python`
+ * and `mysql-connector` (old package name) PyPI packages (imported as `mysql`).
  * See
  * - https://dev.mysql.com/doc/connector-python/en/
  * - https://dev.mysql.com/doc/connector-python/en/connector-python-example-connecting.html
  */
-private module MysqlConnectorPython {
+private module Mysql {
   // ---------------------------------------------------------------------------
   // mysql
   // ---------------------------------------------------------------------------