pyrox.dev
1From abd9f52ade78c737571be69f21dba384be3edf4e Mon Sep 17 00:00:00 2001
2From: Mike Bayer <mike_mp@zzzcomputing.com>
3Date: Sat, 2 Mar 2013 16:24:50 -0500
4Subject: [PATCH] - Fixed an import of "logging" in test_execute which was not
5 working on some linux platforms. [ticket:2669]
6
7---
8 doc/build/changelog/changelog_07.rst | 10 ++++++++++
9 lib/sqlalchemy/__init__.py | 2 +-
10 test/engine/test_execute.py | 2 +-
11 3 files changed, 12 insertions(+), 2 deletions(-)
12
13diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst
14index 416df5a..f07c9ec 100644
15--- a/doc/build/changelog/changelog_07.rst
16+++ b/doc/build/changelog/changelog_07.rst
17@@ -3,6 +3,16 @@
18 0.7 Changelog
19 ==============
20
21+.. changelog::
22+ :version: 0.7.11
23+
24+ .. change::
25+ :tags: bug, tests
26+ :tickets: 2669
27+ :pullreq: 41
28+
29+ Fixed an import of "logging" in test_execute which was not
30+ working on some linux platforms.
31
32 .. changelog::
33 :version: 0.7.10
34diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
35index 9a21a70..6523ccb 100644
36--- a/lib/sqlalchemy/__init__.py
37+++ b/lib/sqlalchemy/__init__.py
38@@ -120,7 +120,7 @@
39 __all__ = sorted(name for name, obj in locals().items()
40 if not (name.startswith('_') or inspect.ismodule(obj)))
41
42-__version__ = '0.7.10'
43+__version__ = '0.7.11'
44
45 del inspect, sys
46
47diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
48index 69b94f1..a37f684 100644
49--- a/test/engine/test_execute.py
50+++ b/test/engine/test_execute.py
51@@ -9,7 +9,7 @@
52 import sqlalchemy as tsa
53 from test.lib import testing, engines
54 from test.lib.engines import testing_engine
55-import logging
56+import logging.handlers
57 from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam
58 from sqlalchemy.engine import base, default
59 from sqlalchemy.engine.base import Connection, Engine
60--
611.8.1.6
62