summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/mapper.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-04-04 19:08:05 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-04-04 19:08:05 -0400
commitf7bb3b17e6df09caa56c20c722364fc52edf7afc (patch)
treeb35d3ccf96f54836b000b7a3416782ef60fcb825 /lib/sqlalchemy/orm/mapper.py
parent60922f7a991cac6500c856868de0ab37f1203cc7 (diff)
downloadsqlalchemy-f7bb3b17e6df09caa56c20c722364fc52edf7afc.tar.gz
- the inspect interface is done, needs docs.
- start dressing up InstanceState for it's coming out, start moving internal things to be underscored within the lib
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
-rw-r--r--lib/sqlalchemy/orm/mapper.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 4fa8dfe24..269242713 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1394,7 +1394,7 @@ class Mapper(object):
yield c
@util.memoized_property
- def properties(self):
+ def attr(self):
if _new_mappers:
configure_mappers()
return util.ImmutableProperties(self._props)
@@ -1418,10 +1418,10 @@ class Mapper(object):
def _filter_properties(self, type_):
if _new_mappers:
configure_mappers()
- return dict(
+ return util.ImmutableProperties(dict(
(k, v) for k, v in self._props.iteritems()
if isinstance(v, type_)
- )
+ ))
@_memoized_configured_property
def _get_clause(self):