summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/__init__.py2
-rw-r--r--lib/sqlalchemy/orm/attributes.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index b28de9bc8..5502aa7b8 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -107,6 +107,6 @@ from sqlalchemy.engine import create_engine, engine_from_config
__all__ = sorted(name for name, obj in locals().items()
if not (name.startswith('_') or inspect.ismodule(obj)))
-__version__ = '0.5.4'
+__version__ = '0.5.4p1'
del inspect, sys
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 4fa41ff3b..4fe562110 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -376,7 +376,7 @@ class AttributeImpl(object):
return self.set_committed_value(state, dict_, value)
else:
if self.key not in dict_:
- return self.get(state, passive=passive)
+ return self.get(state, dict_, passive=passive)
return dict_[self.key]
# Return a new, empty value