summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2022-05-14 10:25:53 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2022-05-15 10:31:51 -0400
commit257de6ebe15d3076e19f05f93c5b3c7fae25a4d3 (patch)
tree6348bcdb7a9f38fc6a04be23ddc9ffec6c5261be /lib/sqlalchemy/engine/base.py
parent9f0db34563a05a7b9f6e09110d35ce0d0f36d3a9 (diff)
downloadsqlalchemy-257de6ebe15d3076e19f05f93c5b3c7fae25a4d3.tar.gz
adjust log stacklevel for py3.11.0b1; enable greenlet
Fixed issue where support for logging "stacklevel" implemented in :ticket:`7612` required adjustment to work with recently released Python 3.11.0b1, also repairs the unit tests which tested this feature. Install greenlet from a py311 compat patch. re: the stacklevel thing, this is going to be very inconvenient if we have to keep hardcoding numbers everywhere for every new python version Change-Id: I0c8f7293e98c0ca5cc544538284bfd1d3020cb1f References: https://github.com/python-greenlet/greenlet/issues/288 Fixes: #8019
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
-rw-r--r--lib/sqlalchemy/engine/base.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index fe3bfa1ad..80e458e7c 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -187,8 +187,8 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
if fmt:
message = fmt(message)
- if util.py38:
- kw["stacklevel"] = 2
+ if log.STACKLEVEL:
+ kw["stacklevel"] = 1 + log.STACKLEVEL_OFFSET
self.engine.logger.info(message, *arg, **kw)
@@ -198,8 +198,8 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
if fmt:
message = fmt(message)
- if util.py38:
- kw["stacklevel"] = 2
+ if log.STACKLEVEL:
+ kw["stacklevel"] = 1 + log.STACKLEVEL_OFFSET
self.engine.logger.debug(message, *arg, **kw)