From 216908717195a448c99e5f55724e3a54aff2af7d Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 24 Mar 2015 10:43:30 -0400 Subject: [PATCH] Fix logging_connection_proxy for sqlalchemy upgrade. The import * is now importing something call inspect which is masking the actual desired inspect import above it. --- lib/galaxy/model/orm/logging_connection_proxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/model/orm/logging_connection_proxy.py b/lib/galaxy/model/orm/logging_connection_proxy.py index 4356721c7e9..cb1b984452d 100644 --- a/lib/galaxy/model/orm/logging_connection_proxy.py +++ b/lib/galaxy/model/orm/logging_connection_proxy.py @@ -2,7 +2,7 @@ import time import inspect import os -from galaxy.model.orm import * +from galaxy.model.orm import ConnectionProxy import logging