diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-03-02 16:24:50 -0500 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-03-02 16:24:50 -0500 |
commit | abd9f52ade78c737571be69f21dba384be3edf4e (patch) | |
tree | 6a1519c70e44dbdd4614d699736b89f77cd06e9f | |
parent | 207be52ec789eb0e77a2010b45c3a078b57b31a4 (diff) | |
download | sqlalchemy-abd9f52ade78c737571be69f21dba384be3edf4e.tar.gz |
- Fixed an import of "logging" in test_execute which was not
working on some linux platforms.
[ticket:2669]
-rw-r--r-- | doc/build/changelog/changelog_07.rst | 10 | ||||
-rw-r--r-- | lib/sqlalchemy/__init__.py | 2 | ||||
-rw-r--r-- | test/engine/test_execute.py | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst index 416df5a5a..f07c9eccd 100644 --- 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 9a21a70f2..6523ccbb1 100644 --- 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 69b94f13d..a37f68431 100644 --- 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 |