sqlalchemy: add the patch so that things work, you know

This commit is contained in:
Domen Kozar 2013-07-28 17:13:19 +02:00
parent 7186fd3f71
commit 8525695a72

View File

@ -0,0 +1,62 @@
From abd9f52ade78c737571be69f21dba384be3edf4e Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 2 Mar 2013 16:24:50 -0500
Subject: [PATCH] - Fixed an import of "logging" in test_execute which was not
working on some linux platforms. [ticket:2669]
---
doc/build/changelog/changelog_07.rst | 10 ++++++++++
lib/sqlalchemy/__init__.py | 2 +-
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 416df5a..f07c9ec 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 9a21a70..6523ccb 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -120,7 +120,7 @@
__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 69b94f1..a37f684 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -9,7 +9,7 @@
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
--
1.8.1.6