Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #520

Merged
merged 1 commit into from
Nov 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Release: 2019-08-09

* ``--static`` build supports ``libmariadbclient.a``
* Try ``mariadb_config`` when ``mysql_config`` is not found
* Fixed warning happend in Python 3.8 (#359)
* Fixed warning happened in Python 3.8 (#359)
* Fixed ``from MySQLdb import *``, while I don't recommend it. (#369)
* Fixed SEGV ``MySQLdb.escape_string("1")`` when libmariadb is used and
no connection is created. (#367)
Expand Down Expand Up @@ -294,7 +294,7 @@ More tests for date and time columns. (#41)

Fix calling .execute() method for closed cursor cause TypeError. (#37)

Improve peformance to parse date. (#43)
Improve performance to parse date. (#43)

Support geometry types (#49)

Expand Down
2 changes: 1 addition & 1 deletion MySQLdb/_mysql.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ _mysql_ResultObject_Initialize(
PyObject *fun2=NULL;
int j, n2=PySequence_Size(fun);
// BINARY_FLAG means ***_bin collation is used.
// To distinguish text and binary, we shoud use charsetnr==63 (binary).
// To distinguish text and binary, we should use charsetnr==63 (binary).
// But we abuse BINARY_FLAG for historical reason.
if (fields[i].charsetnr == 63) {
flags |= BINARY_FLAG;
Expand Down
4 changes: 2 additions & 2 deletions MySQLdb/cursors.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def fetchmany(self, size=None):
return result

def fetchall(self):
"""Fetchs all available rows from the cursor."""
"""Fetches all available rows from the cursor."""
self._check_executed()
if self.rownumber:
result = self._rows[self.rownumber :]
Expand Down Expand Up @@ -437,7 +437,7 @@ def fetchmany(self, size=None):
return r

def fetchall(self):
"""Fetchs all available rows from the cursor."""
"""Fetches all available rows from the cursor."""
self._check_executed()
r = self._fetch_row(0)
self.rownumber = self.rownumber + len(r)
Expand Down
2 changes: 1 addition & 1 deletion doc/user_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ callproc(procname, args)
can only be returned with a SELECT statement. Since a stored
procedure may return zero or more result sets, it is impossible
for MySQLdb to determine if there are result sets to fetch
before the modified parmeters are accessible.
before the modified parameters are accessible.

The parameters are stored in the server as @_*procname*_*n*,
where *n* is the position of the parameter. I.e., if you
Expand Down
2 changes: 1 addition & 1 deletion tests/dbapi20.py
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ def test_setoutputsize_basic(self):
con.close()

def test_setoutputsize(self):
# Real test for setoutputsize is driver dependant
# Real test for setoutputsize is driver dependent
raise NotImplementedError("Driver need to override this test")

def test_None(self):
Expand Down