- Fixed an import of "logging" in test_execute which was not

working on some linux platforms.
[ticket:2669]

diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst
index 416df5a5a30141dd66de56301439277dd6ff921f..f07c9eccd0da36db21f1afa49fca40ad303016fb 100644 (file)
--- a/doc/build/changelog/changelog_07.rst
+++ b/doc/build/changelog/changelog_07.rst
@@ -3,6 +3,16 @@
 0.7 Changelog
 ==============
 
+.. changelog::
+    :version: 0.7.11
+
+    .. change::
+        :tags: bug, tests
+        :tickets: 2669
+        :pullreq: 41
+
+      Fixed an import of "logging" in test_execute which was not
+      working on some linux platforms.
 
 .. changelog::
     :version: 0.7.10

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 9a21a70f26ac0ba9bdb96823b435e870d25af528..6523ccbb1fc1e1a356574a983bcaabf55b57407a 100644 (file)
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -120,7 +120,7 @@ from sqlalchemy.engine import create_engine, engine_from_config
 __all__ = sorted(name for name, obj in locals().items()
                  if not (name.startswith('_') or inspect.ismodule(obj)))
 
-__version__ = '0.7.10'
+__version__ = '0.7.11'
 
 del inspect, sys
 

diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 69b94f13d4bd0f013ac5cd66ebb2c85ef409dc96..a37f6843134004b6957ab054bcc01428b86d53af 100644 (file)
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -9,7 +9,7 @@ from test.lib.schema import Table, Column
 import sqlalchemy as tsa
 from test.lib import testing, engines
 from test.lib.engines import testing_engine
-import logging
+import logging.handlers
 from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
 from sqlalchemy.engine import base, default
 from sqlalchemy.engine.base import Connection, Engine