summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/__init__.py5
-rw-r--r--lib/sqlalchemy/testing/warnings.py2
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 8e9647840..bdc5cbf67 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -110,6 +110,11 @@ def create_session(bind=None, **kwargs):
False, ``autocommit`` is True. In this sense the session acts
more like the "classic" SQLAlchemy 0.3 session with these.
+ .. deprecated:: 1.4 The "autocommit" parameter will be removed in
+ SQLAlchemy 2.0. :func:`_orm.create_session` will return a
+ :class:`_orm.Session` that does not include "autocommit' behavior
+ in release 2.0.
+
Usage::
>>> from sqlalchemy.orm import create_session
diff --git a/lib/sqlalchemy/testing/warnings.py b/lib/sqlalchemy/testing/warnings.py
index 2a0c486d2..dbbafa701 100644
--- a/lib/sqlalchemy/testing/warnings.py
+++ b/lib/sqlalchemy/testing/warnings.py
@@ -68,10 +68,8 @@ def setup_filters():
#
# ORM Session
#
- r"The Session.autocommit parameter is deprecated ",
r"The merge_result\(\) method is superseded by the "
r"merge_frozen_result\(\)",
- r"The Session.begin.subtransactions flag is deprecated",
]:
warnings.filterwarnings(
"ignore",