(no commit message)

diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py
index 8f274bd51138dace255097a64934c7416aa3454b..8e7b04473f1963a30d43635d5cea6a6216ccb16a 100644 (file)
--- a/lib/sqlalchemy/mapper.py
+++ b/lib/sqlalchemy/mapper.py
@@ -473,7 +473,10 @@ class SmartProperty(object):
             del s.__dict__[self.key]
             s.dirty = True
         def get_prop(s):
-            v = s.__dict__[self.key]
+            try:
+                v = s.__dict__[self.key]
+            except KeyError:
+                raise AttributeError(self.key)
             if isinstance(v, types.FunctionType):
                 s.__dict__[self.key] = v()
             return s.__dict__[self.key]