Skip to content

Spelling fixes #112

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

Merged
merged 1 commit into from
Sep 11, 2016
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 MySQLdb/cursors.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@


#: Regular expression for :meth:`Cursor.executemany`.
#: executemany only suports simple bulk insert.
#: executemany only supports simple bulk insert.
#: You can use it to load large dataset.
RE_INSERT_VALUES = re.compile(
r"\s*((?:INSERT|REPLACE)\s.+\sVALUES?\s+)" +
Expand Down Expand Up @@ -475,7 +475,7 @@ class CursorUseResultMixIn(object):
"""This is a MixIn class which causes the result set to be stored
in the server and sent row-by-row to client side, i.e. it uses
mysql_use_result(). You MUST retrieve the entire result set and
close() the cursor before additional queries can be peformed on
close() the cursor before additional queries can be performed on
the connection."""

_defer_warnings = True
Expand Down
2 changes: 1 addition & 1 deletion _mysql.c
Original file line number Diff line number Diff line change
Expand Up @@ -2508,7 +2508,7 @@ static struct PyMemberDef _mysql_ConnectionObject_memberlist[] = {
T_UINT,
offsetof(_mysql_ConnectionObject,connection.server_capabilities),
READONLY,
"Capabilites of server; consult MySQLdb.constants.CLIENT"
"Capabilities of server; consult MySQLdb.constants.CLIENT"
},
{
"port",
Expand Down
2 changes: 1 addition & 1 deletion doc/FAQ.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ threadsafe = False.

This almost always mean you don't have development packages
installed. On some systems, C headers for various things (like MySQL)
are distributed as a seperate package. You'll need to figure out
are distributed as a separate package. You'll need to figure out
what that is and install it, but often the name ends with -devel.

Another possibility: Some older versions of mysql_config behave oddly
Expand Down
4 changes: 2 additions & 2 deletions doc/user_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ conv
is a function as above. The sequence is tested until the flags
on the field match those of the first value. If both values
are None, then the default conversion is done. Presently this
is only used to distinquish TEXT and BLOB columns.
is only used to distinguish TEXT and BLOB columns.

If the key is a Python type or class, then the value is a
callable Python object (usually a function) taking two arguments
Expand Down Expand Up @@ -615,7 +615,7 @@ Using and extending
-------------------

In general, it is probably wise to not directly interact with the DB
API except for small applicatons. Databases, even SQL databases, vary
API except for small applications. Databases, even SQL databases, vary
widely in capabilities and may have non-standard features. The DB API
does a good job of providing a reasonably portable interface but some
methods are non-portable. Specifically, the parameters accepted by
Expand Down
10 changes: 5 additions & 5 deletions tests/dbapi20.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
# - Now a subclass of TestCase, to avoid requiring the driver stub
# to use multiple inheritance
# - Reversed the polarity of buggy test in test_description
# - Test exception heirarchy correctly
# - Test exception hierarchy correctly
# - self.populate is now self._populate(), so if a driver stub
# overrides self.ddl1 this change propogates
# overrides self.ddl1 this change propagates
# - VARCHAR columns now have a width, which will hopefully make the
# DDL even more portible (this will be reversed if it causes more problems)
# - cursor.rowcount being checked after various execute and fetchXXX methods
Expand Down Expand Up @@ -176,7 +176,7 @@ def test_paramstyle(self):

def test_Exceptions(self):
# Make sure required exceptions exist, and are in the
# defined heirarchy.
# defined hierarchy.
self.assertTrue(issubclass(self.driver.Warning,Exception))
self.assertTrue(issubclass(self.driver.Error,Exception))
self.assertTrue(
Expand Down Expand Up @@ -485,7 +485,7 @@ def test_fetchone(self):
self.assertRaises(self.driver.Error,cur.fetchone)

# cursor.fetchone should raise an Error if called after
# executing a query that cannnot return rows
# executing a query that cannot return rows
self.executeDDL1(cur)
self.assertRaises(self.driver.Error,cur.fetchone)

Expand All @@ -497,7 +497,7 @@ def test_fetchone(self):
self.assertTrue(cur.rowcount in (-1,0))

# cursor.fetchone should raise an Error if called after
# executing a query that cannnot return rows
# executing a query that cannot return rows
cur.execute("insert into %sbooze values ('Victoria Bitter')" % (
self.table_prefix
))
Expand Down
4 changes: 2 additions & 2 deletions tests/test_MySQLdb_dbapi20.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test_fetchone(self):
self.assertRaises(self.driver.Error,cur.fetchone)

# cursor.fetchone should raise an Error if called after
# executing a query that cannnot return rows
# executing a query that cannot return rows
self.executeDDL1(cur)
## self.assertRaises(self.driver.Error,cur.fetchone)

Expand All @@ -92,7 +92,7 @@ def test_fetchone(self):
self.assertTrue(cur.rowcount in (-1,0))

# cursor.fetchone should raise an Error if called after
# executing a query that cannnot return rows
# executing a query that cannot return rows
cur.execute("insert into %sbooze values ('Victoria Bitter')" % (
self.table_prefix
))
Expand Down