summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMichael Trier <mtrier@gmail.com>2009-03-29 04:29:50 +0000
committerMichael Trier <mtrier@gmail.com>2009-03-29 04:29:50 +0000
commit8e8546c919e7f9dc41f8619d02e79e10d2ab6333 (patch)
tree76464e239daedfc23566db1dae6cc0247a70a3b5 /lib/sqlalchemy
parentaf012dd588afb880db2858706dc7f9627382e08a (diff)
downloadsqlalchemy-8e8546c919e7f9dc41f8619d02e79e10d2ab6333.tar.gz
Corrected docstring for class_mapper. It does not accept an object. Fixes #1316.
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index 37c88907b..c858ca102 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -547,7 +547,7 @@ def object_mapper(instance):
raise exc.UnmappedInstanceError(instance)
def class_mapper(class_, compile=True):
- """Given a class (or an object), return the primary Mapper associated with the key.
+ """Given a class, return the primary Mapper associated with the key.
Raises UnmappedClassError if no mapping is configured.
@@ -597,7 +597,7 @@ def _is_mapped_class(cls):
manager = attributes.manager_of_class(cls)
return manager and _INSTRUMENTOR in manager.info
return False
-
+
def instance_str(instance):
"""Return a string describing an instance."""