Skip to content

Commit 64882fc

Browse files
authored
Merge pull request #21 from vaerksted/1.1
fix typos
2 parents 5420fe3 + d2f9780 commit 64882fc

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

include/docs/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"write_timeout: integer\n"\
3333
" write timeout in seconds\n\n"\
3434
"local_infile: boolean\n"\
35-
" Eenables or disables the use of LOAD DATA LOCAL INFILE statements.\n\n"\
35+
" Enables or disables the use of LOAD DATA LOCAL INFILE statements.\n\n"\
3636
"compress: boolean\n"\
3737
" Uses the compressed protocol for client server communication. If the\n"\
3838
" server doesn't support compressed protocol, the default protocol will\n"\

mariadb/connectionpool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def __init__(self, *args, **kwargs):
101101
try:
102102
connection= mariadb.Connection(**self._conn_args)
103103
except:
104-
# if an error occured, close all connections and raise exception
104+
# if an error occurred, close all connections and raise exception
105105
for j in range(0, len(self._connections)):
106106
try:
107107
self._connections[j].close()

mariadb/connections.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def __init__(self, *args, **kwargs):
6767
raise mariadb.ProgrammingError("Host failover list requires MariaDB Connector/C 3.3.0 or newer")
6868

6969

70-
# compatibiity feature: if SSL is provided as a dictionary,
70+
# compatibility feature: if SSL is provided as a dictionary,
7171
# we will map it's content
7272
if "ssl" in kwargs and not isinstance(kwargs["ssl"], bool):
7373
ssl= kwargs.pop("ssl", None)

mariadb/constants/FIELD_FLAG.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
These constants represent the various field flags. As an addition
44
to the DBAPI 2.0 standard (PEP-249) these flags are returned as
5-
eigth element of the cursor description attribute.
5+
eighth element of the cursor description attribute.
66
77
Field flags are defined in module *mariadb.constants.FIELD_FLAG*
88
"""

mariadb/dbapi20.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def Binary(object):
6868
return bytes(object)
6969

7070
def Date(year, month, day):
71-
"""Contructs an object holding a date value."""
71+
"""Constructs an object holding a date value."""
7272
return datetime.date(year, month, day)
7373

7474
def Time(hour, minute, second):

mariadb/mariadb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ PyMODINIT_FUNC PyInit__mariadb(void)
9494
{
9595
PyObject *module= PyModule_Create(&mariadb_module);
9696

97-
/* Initialite DateTimeAPI */
97+
/* Initialize DateTimeAPI */
9898
if (mariadb_datetime_init() ||
9999
codecs_datetime_init())
100100
{

mariadb/mariadb_connection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ PyObject *MrdbConnection_ping(MrdbConnection *self)
525525
return NULL;
526526
}
527527

528-
/* in case a reconnect occured, we need to obtain new thread_id */
528+
/* in case a reconnect occurred, we need to obtain new thread_id */
529529
self->thread_id= mysql_thread_id(self->mysql);
530530

531531
Py_RETURN_NONE;

testing/test/integration/test_dbapi20.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
# - self.populate is now self._populate(), so if a driver stub
6262
# overrides self.ddl1 this change propagates
6363
# - VARCHAR columns now have a width, which will hopefully make the
64-
# DDL even more portible (this will be reversed if it causes more problems)
64+
# DDL even more portable (this will be reversed if it causes more problems)
6565
# - cursor.rowcount being checked after various execute and fetchXXX methods
6666
# - Check for fetchall and fetchmany returning empty lists after results
6767
# are exhausted (already checking for empty lists if select retrieved
@@ -77,7 +77,7 @@ class DatabaseAPI20Test(unittest.TestCase):
7777
''' Test a database self.driver for DB API 2.0 compatibility.
7878
This implementation tests Gadfly, but the TestCase
7979
is structured so that other self.drivers can subclass this
80-
test case to ensure compiliance with the DB-API. It is
80+
test case to ensure compliance with the DB-API. It is
8181
expected that this TestCase may be expanded in the future
8282
if ambiguities or edge conditions are discovered.
8383

0 commit comments

Comments
 (0)