From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 15 Jan 2014 01:22:11 +0000 (-0500)
Subject: - changelog + test for pullreq github 58
X-Git-Tag: rel_0_8_5~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aace3b0e9694e393605abea91a1b25da4d162c3c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- changelog + test for pullreq github 58
---

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 497bf76439..c65fcdd406 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -11,6 +11,15 @@
 .. changelog::
     :version: 0.8.5
 
+    .. change::
+        :tags: bug, orm
+        :versions: 0.9.2
+        :pullreq: github:58
+
+        Fixed error message when an iterator object is passed to
+        :func:`.class_mapper` or similar, where the error would fail to
+        render on string formatting.  Pullreq courtesy Kyle Stark.
+
     .. change::
         :tags: bug, firebird
         :versions: 0.9.0b2
diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py
index 6b97fb1353..9cd0c77eda 100644
--- a/test/orm/test_mapper.py
+++ b/test/orm/test_mapper.py
@@ -1572,6 +1572,13 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL):
             class_mapper, 5
         )
 
+    def test_unmapped_not_type_error_iter_ok(self):
+        assert_raises_message(
+            sa.exc.ArgumentError,
+            r"Class object expected, got '\(5, 6\)'.",
+            class_mapper, (5, 6)
+        )
+
     def test_unmapped_subclass_error_postmap(self):
         users = self.tables.users