summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/util.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-11-20 11:03:01 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-11-20 11:03:01 -0500
commitfe8f8349c9f46abe37cd9de7876df0eeb5e12c94 (patch)
tree29b6b1f953d24f4b49a84069f13f3ef72e594212 /lib/sqlalchemy/engine/util.py
parent2799a674038bef5a81102935ae43c70163f0c556 (diff)
parentead37e4ec0dd5750769226befea043d9527f869e (diff)
downloadsqlalchemy-fe8f8349c9f46abe37cd9de7876df0eeb5e12c94.tar.gz
- an enormous merge just because I committed a one line log entry. the joy of DVCS
Diffstat (limited to 'lib/sqlalchemy/engine/util.py')
-rw-r--r--lib/sqlalchemy/engine/util.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/util.py b/lib/sqlalchemy/engine/util.py
index 6bf8f2d3f..8cdfd5cdf 100644
--- a/lib/sqlalchemy/engine/util.py
+++ b/lib/sqlalchemy/engine/util.py
@@ -6,6 +6,7 @@
from .. import util
+
def _coerce_config(configuration, prefix):
"""Convert configuration values to expected types."""
@@ -26,6 +27,7 @@ def _coerce_config(configuration, prefix):
util.coerce_kw_type(options, option, type_)
return options
+
def connection_memoize(key):
"""Decorator, memoize a function in a connection.info stash.
@@ -44,6 +46,7 @@ def connection_memoize(key):
return decorated
+
def py_fallback():
def _distill_params(multiparams, params):
"""Given arguments from the calling form *multiparams, **params,
@@ -89,5 +92,3 @@ try:
from sqlalchemy.cutils import _distill_params
except ImportError:
globals().update(py_fallback())
-
-