From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 20 Mar 2015 23:53:12 +0000 (-0400)
Subject: - Repaired the commit for issue #2771 which was inadvertently commented
X-Git-Tag: rel_1_0_0_b3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ae00fea903b3403c1900e9b9f440305362dd26c;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Repaired the commit for issue #2771 which was inadvertently commented
out.
- add __backend__ to the dialect suite so that it runs on CI.
- will be 1.0.0b3
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index da20aa53b4..3c0aa885a6 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -15,6 +15,17 @@
     .. include:: changelog_07.rst
         :start-line: 5
 
+.. changelog::
+    :version: 1.0.0b3
+
+    .. change::
+        :tags: bug, mysql
+        :tickets: 2771
+
+        Repaired the commit for issue #2771 which was inadvertently commented
+        out.
+
+
 .. changelog::
     :version: 1.0.0b2
     :released: March 20, 2015
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 41ee656c78..94ab772b14 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -120,7 +120,7 @@ from .schema import (
 from .inspection import inspect
 from .engine import create_engine, engine_from_config
 
-__version__ = '1.0.0b2'
+__version__ = '1.0.0b3'
 
 
 def __go(lcls):
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 8727154f14..a74b20ac4f 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -3351,7 +3351,7 @@ class _DecodingRowProxy(object):
 
     def __init__(self, rowproxy, charset):
         self.rowproxy = rowproxy
-        self.charset = charset #self._encoding_compat.get(charset, charset)
+        self.charset = self._encoding_compat.get(charset, charset)
 
     def __getitem__(self, index):
         item = self.rowproxy[index]
diff --git a/test/dialect/mysql/test_dialect.py b/test/dialect/mysql/test_dialect.py
index 37b3897ac5..3df5168df8 100644
--- a/test/dialect/mysql/test_dialect.py
+++ b/test/dialect/mysql/test_dialect.py
@@ -8,7 +8,10 @@ from sqlalchemy import testing
 from sqlalchemy.testing import engines
 import datetime
 
+
 class DialectTest(fixtures.TestBase):
+    __backend__ = True
+
     def test_ssl_arguments_mysqldb(self):
         from sqlalchemy.dialects.mysql import mysqldb
         dialect = mysqldb.dialect()