summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Di Gregorio <fog@initd.org>2010-07-18 12:14:46 +0200
committerFederico Di Gregorio <fog@initd.org>2010-07-18 12:14:46 +0200
commit557608f715d0b7aade3f3b7c71b88c60c7f46175 (patch)
tree336c1ab745740a528d02054f74ae189adf509951
parentb263fbf274f9085a1bddca018ed8a50d37023fc7 (diff)
downloadpsycopg2-557608f715d0b7aade3f3b7c71b88c60c7f46175.tar.gz
Applied spelling fixes patch from Peter Eisentraut
-rw-r--r--doc/src/extensions.rst2
-rw-r--r--psycopg/cursor_type.c2
-rw-r--r--psycopg/psycopg.h2
-rw-r--r--setup.py2
-rwxr-xr-xtests/test_transaction.py4
5 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/extensions.rst b/doc/src/extensions.rst
index 268befa..d98320a 100644
--- a/doc/src/extensions.rst
+++ b/doc/src/extensions.rst
@@ -309,7 +309,7 @@ The module exports a few exceptions in addition to the :ref:`standard ones
(subclasses `~psycopg2.OperationalError`)
- Error related to SQL query cancelation. It can be trapped specifically to
+ Error related to SQL query cancellation. It can be trapped specifically to
detect a timeout.
.. versionadded:: 2.0.7
diff --git a/psycopg/cursor_type.c b/psycopg/cursor_type.c
index 1a1e859..d685852 100644
--- a/psycopg/cursor_type.c
+++ b/psycopg/cursor_type.c
@@ -1553,7 +1553,7 @@ static struct PyMemberDef cursorObject_members[] = {
{"rowcount", T_LONG, OFFSETOF(rowcount), RO,
"Number of rows read from the backend in the last command."},
{"arraysize", T_LONG, OFFSETOF(arraysize), 0,
- "Number of records `fetchmany()` must fetch if not explicitely " \
+ "Number of records `fetchmany()` must fetch if not explicitly " \
"specified."},
{"description", T_OBJECT, OFFSETOF(description), RO,
"Cursor description as defined in DBAPI-2.0."},
diff --git a/psycopg/psycopg.h b/psycopg/psycopg.h
index ea90b5a..d023e47 100644
--- a/psycopg/psycopg.h
+++ b/psycopg/psycopg.h
@@ -153,7 +153,7 @@ HIDDEN char *psycopg_escape_string(PyObject *conn,
#ifdef PSYCOPG_EXTENSIONS
#define QueryCanceledError_doc \
-"Error related to SQL query cancelation."
+"Error related to SQL query cancellation."
#define TransactionRollbackError_doc \
"Error causing transaction rollback (deadlocks, serialisation failures, etc)."
diff --git a/setup.py b/setup.py
index bf5281f..2fec5ea 100644
--- a/setup.py
+++ b/setup.py
@@ -114,7 +114,7 @@ class psycopg_build_ext(build_ext):
def get_compiler(self):
"""Return the name of the C compiler used to compile extensions.
- If a compiler was not explicitely set (on the command line, for
+ If a compiler was not explicitly set (on the command line, for
example), fall back on the default compiler.
"""
if self.compiler:
diff --git a/tests/test_transaction.py b/tests/test_transaction.py
index f279bbd..030bf17 100755
--- a/tests/test_transaction.py
+++ b/tests/test_transaction.py
@@ -204,8 +204,8 @@ class DeadlockSerializationTests(unittest.TestCase):
error, psycopg2.extensions.TransactionRollbackError))
-class QueryCancelationTests(unittest.TestCase):
- """Tests for query cancelation."""
+class QueryCancellationTests(unittest.TestCase):
+ """Tests for query cancellation."""
def setUp(self):
self.conn = psycopg2.connect(tests.dsn)