summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--lib/sqlalchemy/orm/attributes.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 4807a39d1..7d1f40f38 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,11 @@ CHANGES
single-table-inheritance subclass which
generates columns to put up onto the base.
+- orm
+ - Added missing comma to PASSIVE_RETURN_NEVER_SET
+ symbol [ticket:2304]
+
+
0.7.3
=====
- general
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 2ecd233a7..f8078cfaa 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -28,7 +28,7 @@ ATTR_EMPTY = util.symbol('ATTR_EMPTY')
NO_VALUE = util.symbol('NO_VALUE')
NEVER_SET = util.symbol('NEVER_SET')
-PASSIVE_RETURN_NEVER_SET = util.symbol('PASSIVE_RETURN_NEVER_SET'
+PASSIVE_RETURN_NEVER_SET = util.symbol('PASSIVE_RETURN_NEVER_SET',
"""Symbol indicating that loader callables can be
fired off, but if no callable is applicable and no value is
present, the attribute should remain non-initialized.