- use class name by itself in flush warnings to prevent overflow of warnings registry

- test suite swaps out warnings.warn with warnings.warn_explicit, to solve warnings registry issue
- explicitly disallow functions from inside test.bootstrap, test.lib being interpreted as tests

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index e57b1575a..b9958f775 100644
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -727,9 +727,9 @@ class ManyToOneDP(DependencyProcessor):
             child is not None and \
             not uowcommit.session._contains_state(child):
             util.warn(
-                "Child %s not in session, %s "
+                "Object of type %s not in session, %s "
                 "operation along '%s' won't proceed" % 
-                (mapperutil.state_str(child), operation, self.prop))
+                (mapperutil.state_class_str(child), operation, self.prop))
             return
             
         if clearkeys or child is None:
@@ -1097,9 +1097,9 @@ class ManyToManyDP(DependencyProcessor):
         if child is not None and not uowcommit.session._contains_state(child):
             if not child.deleted:
                 util.warn(
-                    "Child %s not in session, %s "
+                    "Object of type %s not in session, %s "
                     "operation along '%s' won't proceed" % 
-                    (mapperutil.state_str(child), operation, self.prop))
+                    (mapperutil.state_class_str(child), operation, self.prop))
             return False
             
         self._verify_canload(child)