summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2014-05-11 13:04:05 -0400
committermike bayer <mike_mp@zzzcomputing.com>2014-05-11 13:04:05 -0400
commit1abd53a3556b9593d9eba868d69c13bae3c3a7ab (patch)
treeaa51705fc9d0074225835290f482d9dff135d473 /lib/sqlalchemy/orm
parent230c0d5a19978872fae4e1261736a9e300ae9bf1 (diff)
parentf341cfbfe117e777569d58eb6d2c3d3f7fe7bbf3 (diff)
downloadsqlalchemy-1abd53a3556b9593d9eba868d69c13bae3c3a7ab.tar.gz
Merge pull request #91 from smurfix/de_apostroph_ify
Documentation fix-up: "its" vs. "it's"
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/collections.py2
-rw-r--r--lib/sqlalchemy/orm/deprecated_interfaces.py4
-rw-r--r--lib/sqlalchemy/orm/events.py6
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py
index 87e351b6c..530cce962 100644
--- a/lib/sqlalchemy/orm/collections.py
+++ b/lib/sqlalchemy/orm/collections.py
@@ -445,7 +445,7 @@ class collection(object):
The converter method will receive the object being assigned and should
return an iterable of values suitable for use by the ``appender``
method. A converter must not assign values or mutate the collection,
- it's sole job is to adapt the value the user provides into an iterable
+ its sole job is to adapt the value the user provides into an iterable
of values for the ORM's use.
The default converter implementation will use duck-typing to do the
diff --git a/lib/sqlalchemy/orm/deprecated_interfaces.py b/lib/sqlalchemy/orm/deprecated_interfaces.py
index 020b7c718..e4495e12a 100644
--- a/lib/sqlalchemy/orm/deprecated_interfaces.py
+++ b/lib/sqlalchemy/orm/deprecated_interfaces.py
@@ -127,7 +127,7 @@ class MapperExtension(object):
return EXT_CONTINUE
def init_instance(self, mapper, class_, oldinit, instance, args, kwargs):
- """Receive an instance when it's constructor is called.
+ """Receive an instance when its constructor is called.
This method is only called during a userland construction of
an object. It is not called when an object is loaded from the
@@ -140,7 +140,7 @@ class MapperExtension(object):
return EXT_CONTINUE
def init_failed(self, mapper, class_, oldinit, instance, args, kwargs):
- """Receive an instance when it's constructor has been called,
+ """Receive an instance when its constructor has been called,
and raised an exception.
This method is only called during a userland construction of
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index 6bc6b17ff..996e04edb 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -213,7 +213,7 @@ class InstanceEvents(event.Events):
"""
def init(self, target, args, kwargs):
- """Receive an instance when it's constructor is called.
+ """Receive an instance when its constructor is called.
This method is only called during a userland construction of
an object. It is not called when an object is loaded from the
@@ -222,7 +222,7 @@ class InstanceEvents(event.Events):
"""
def init_failure(self, target, args, kwargs):
- """Receive an instance when it's constructor has been called,
+ """Receive an instance when its constructor has been called,
and raised an exception.
This method is only called during a userland construction of
@@ -316,7 +316,7 @@ class InstanceEvents(event.Events):
"""
def unpickle(self, target, state_dict):
- """Receive an object instance after it's associated state has
+ """Receive an object instance after its associated state has
been unpickled.
:param target: the mapped instance. If