From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 3 Mar 2015 00:00:19 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/pr/132' into pr132
X-Git-Tag: rel_1_0_0b1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d140983148f1acbee7606a037bdf0a9f144cd173;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge remote-tracking branch 'origin/pr/132' into pr132
---

d140983148f1acbee7606a037bdf0a9f144cd173
diff --cc test/dialect/postgresql/test_dialect.py
index 9f86aaa7af,cf470f0554..bdd292fff6
--- a/test/dialect/postgresql/test_dialect.py
+++ b/test/dialect/postgresql/test_dialect.py
@@@ -115,11 -117,11 +117,12 @@@ class MiscTest(fixtures.TestBase, Asser
  
          e = engines.testing_engine(options={'client_encoding': test_encoding})
          c = e.connect()
-         eq_(c.connection.connection.encoding, test_encoding)
+         new_encoding = c.execute("show client_encoding").fetchone()[0]
+         eq_(new_encoding, test_encoding)
  
      @testing.only_on(
 -        ['postgresql+psycopg2', 'postgresql+pg8000'],
 +        ['postgresql+psycopg2', 'postgresql+pg8000',
 +         'postgresql+psycopg2cffi'],
          'psycopg2 / pg8000 - specific feature')
      @engines.close_open_connections
      def test_autocommit_isolation_level(self):