Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at 16.09 1.5 kB view raw
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/test/engine/test_execute.py b/test/engine/test_execute.py 35index 69b94f1..a37f684 100644 36--- a/test/engine/test_execute.py 37+++ b/test/engine/test_execute.py 38@@ -9,7 +9,7 @@ 39 import sqlalchemy as tsa 40 from test.lib import testing, engines 41 from test.lib.engines import testing_engine 42-import logging 43+import logging.handlers 44 from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam 45 from sqlalchemy.engine import base, default 46 from sqlalchemy.engine.base import Connection, Engine 47-- 481.8.1.6 49