Change 'collate' to 'collation' per request

Author: vsalvino

MySQLdb/connections.py

@@ -100,7 +100,7 @@ class object, used to create cursors (keyword only)
             If omitted, empty string, or None, the default character set
             from the server will be used.
 
-        :param str collate:
+        :param str collation:
             If ``charset`` and ``collation`` are both supplied, the
             character set and collation for the current conneciton
             will be set.
@@ -179,7 +179,7 @@ class object, used to create cursors (keyword only)
 
         cursorclass = kwargs2.pop("cursorclass", self.default_cursor)
         charset = kwargs2.get("charset", "")
-        collate = kwargs2.pop("collate", "")
+        collation = kwargs2.pop("collation", "")
         use_unicode = kwargs2.pop("use_unicode", True)
         sql_mode = kwargs2.pop("sql_mode", "")
         self._binary_prefix = kwargs2.pop("binary_prefix", False)
@@ -204,8 +204,8 @@ class object, used to create cursors (keyword only)
 
         self.encoding = "ascii"  # overridden in set_character_set()
 
-        if charset and collate:
-            self.set_character_set_collation(charset, collate)
+        if charset and collation:
+            self.set_character_set_collation(charset, collation)
         else:
             if not charset:
                 charset = self.character_set_name()
@@ -313,11 +313,11 @@ def set_character_set(self, charset):
         super().set_character_set(charset)
         self.encoding = _charset_to_encoding.get(charset, charset)
 
-    def set_character_set_collation(self, charset, collate):
+    def set_character_set_collation(self, charset, collation):
         """Set the connection character set and collation. Use this as
         an alternative to ``set_character_set``.
         """
-        self.query("SET NAMES %s COLLATE %s" % (charset, collate))
+        self.query("SET NAMES %s COLLATE %s" % (charset, collation))
         self.store_result()
         self.encoding = _charset_to_encoding.get(charset, charset)
 

doc/user_guide.rst

@@ -344,9 +344,9 @@ connect(parameters...)
 
             *This must be a keyword parameter.*
 
-         collate
+         collation
 
-            If ``charset`` and ``collate`` are both supplied, the
+            If ``charset`` and ``collation`` are both supplied, the
             character set and collation for the current conneciton
             will be set.
 

tests/test_MySQLdb_nonstandard.py

@@ -124,13 +124,13 @@ def setUp(self):
         # collation.
         self.conn = connection_factory(
             charset="utf8mb4",
-            collate="utf8mb4_esperanto_ci",
+            collation="utf8mb4_esperanto_ci",
         )
 
     def tearDown(self):
         self.conn.close()
 
-    def test_charset_collate(self):
+    def test_charset_collation(self):
         c = self.conn.cursor()
         c.execute(
             """
@@ -141,6 +141,6 @@ def test_charset_collate(self):
         )
         row = c.fetchall()
         charset = row[0][1]
-        collate = row[1][1]
+        collation = row[1][1]
         self.assertEqual(charset, "utf8mb4")
-        self.assertEqual(collate, "utf8mb4_esperanto_ci")
+        self.assertEqual(collation, "utf8mb4_esperanto_ci")