From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 18 Mar 2013 18:00:47 +0000 (-0700)
Subject: merge plus fix the test spelling too
X-Git-Tag: rel_0_8_1~26^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72c4bdf735d8d81b6ff182d7cc15bbfe56078d12;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge plus fix the test spelling too
---

72c4bdf735d8d81b6ff182d7cc15bbfe56078d12
diff --cc test/sql/test_compiler.py
index fe52402eca,fe52402eca..fa15c7aa29
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@@ -2211,14 -2211,14 +2211,14 @@@ class SelectTest(fixtures.TestBase, Ass
  
          assert_raises_message(
              exc.CompileError,
--            "Cannot compile Column object until it's 'name' is assigned.",
++            "Cannot compile Column object until its 'name' is assigned.",
              str, sel2
          )
  
          sel3 = select([my_str]).as_scalar()
          assert_raises_message(
              exc.CompileError,
--            "Cannot compile Column object until it's 'name' is assigned.",
++            "Cannot compile Column object until its 'name' is assigned.",
              str, sel3
          )