summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-08-09 22:56:23 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-08-09 22:56:23 +0000
commitbd68dcfde83e964308e4f4de327a3858efd941eb (patch)
tree0abef96227090112ca4a6c1352c3b2fedb06144b
parent5f094f9ec76dad68166e8b9908b0b75d6edfe5d5 (diff)
downloadsqlalchemy-bd68dcfde83e964308e4f4de327a3858efd941eb.tar.gz
formatting tweaks
-rw-r--r--doc/build/gen_docstrings.py2
-rw-r--r--lib/sqlalchemy/orm/session.py32
2 files changed, 17 insertions, 17 deletions
diff --git a/doc/build/gen_docstrings.py b/doc/build/gen_docstrings.py
index 28e8c1dc8..a22a823d8 100644
--- a/doc/build/gen_docstrings.py
+++ b/doc/build/gen_docstrings.py
@@ -36,7 +36,7 @@ def make_all_docs():
orm.collections.MappedCollection,
orm.collections.CollectionAdapter]),
make_doc(obj=orm.interfaces),
- make_doc(obj=orm.mapperlib, classes=[orm.mapperlib.MapperExtension, orm.mapperlib.Mapper]),
+ make_doc(obj=orm.mapperlib, classes=[orm.mapperlib.Mapper]),
make_doc(obj=orm.properties),
make_doc(obj=orm.query, classes=[orm.query.Query]),
make_doc(obj=orm.session, classes=[orm.session.Session]),
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index ab12d4c14..48b71c799 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -210,22 +210,22 @@ class Session(object):
SQLAlchemy's unit of work includes these functions:
- * The ability to track in-memory changes on scalar- and collection-based object
- attributes, such that database persistence operations can be assembled based on those
- changes.
-
- * The ability to organize individual SQL queries and population of newly generated
- primary and foreign key-holding attributes during a persist operation
- such that referential integrity is maintained at all times.
-
- * The ability to maintain insert ordering against the order in which
- new instances were added to the session.
-
- * an Identity Map, which is a dictionary keying instances to their unique primary key
- identity. This ensures that only one copy of a particular entity is ever present
- within the session, even if repeated load operations for the same entity occur. This
- allows many parts of an application to get a handle to a particular object without
- any chance of modifications going to two different places.
+ * The ability to track in-memory changes on scalar- and collection-based object
+ attributes, such that database persistence operations can be assembled based on those
+ changes.
+
+ * The ability to organize individual SQL queries and population of newly generated
+ primary and foreign key-holding attributes during a persist operation such that
+ referential integrity is maintained at all times.
+
+ * The ability to maintain insert ordering against the order in which new instances were
+ added to the session.
+
+ * an Identity Map, which is a dictionary keying instances to their unique primary key
+ identity. This ensures that only one copy of a particular entity is ever present
+ within the session, even if repeated load operations for the same entity occur. This
+ allows many parts of an application to get a handle to a particular object without
+ any chance of modifications going to two different places.
When dealing with instances of mapped classes, an instance may be *attached* to a
particular Session, else it is *unattached* . An instance also may or may not correspond