From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 20 Oct 2011 19:00:17 +0000 (-0400)
Subject: - Added missing comma to PASSIVE_RETURN_NEVER_SET
X-Git-Tag: rel_0_7_4~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeafd0f5537ffe5855dcafa9762f50b8e6da13a1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Added missing comma to PASSIVE_RETURN_NEVER_SET
symbol [ticket:2304]
---

diff --git a/CHANGES b/CHANGES
index 4807a39d1d..7d1f40f383 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 2ecd233a78..f8078cfaac 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.