- restored MapperExtension functionality for [ticket:829], added test coverage

- changed naming convention in mapper.py tests to test_<testname>

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index f4294502b..9e3f20257 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -122,8 +122,11 @@ class ExtensionCarrier(object):
     """
     
     def __init__(self, _elements=None):
-        self.__elements = _elements or []
         self.methods = {}
+        if _elements is not None:
+            self.__elements = [self.__inspect(e) for e in _elements]
+        else:
+            self.__elements = []
         
     def copy(self):
         return ExtensionCarrier(list(self.__elements))