summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <classic@zzzcomputing.com>2015-03-06 11:20:45 -0500
committerMike Bayer <classic@zzzcomputing.com>2015-03-06 11:20:45 -0500
commit0a1f720355f02d38da2a5a8444712dd7d199c713 (patch)
tree7efc4f79cc2ff6415fc9c0581b6a93a2693f03e5
parent05ac6bcc0e2f7557f26a05e171be956c651f443a (diff)
parent34cb52e8d9f9bf345904315f16fb87ca9310d9cb (diff)
downloadsqlalchemy-0a1f720355f02d38da2a5a8444712dd7d199c713.tar.gz
Merged in jocmeh/sqlalchemy (pull request #46)
minor docstring fix in MappedCollection class
-rw-r--r--lib/sqlalchemy/orm/collections.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py
index 356a8a3b9..e50d81b77 100644
--- a/lib/sqlalchemy/orm/collections.py
+++ b/lib/sqlalchemy/orm/collections.py
@@ -1507,8 +1507,8 @@ class MappedCollection(dict):
def __init__(self, keyfunc):
"""Create a new collection with keying provided by keyfunc.
- keyfunc may be any callable any callable that takes an object and
- returns an object for use as a dictionary key.
+ keyfunc may be any callable that takes an object and returns an object
+ for use as a dictionary key.
The keyfunc will be called every time the ORM needs to add a member by
value-only (such as when loading instances from the database) or