summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/__init__.py
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2020-10-30 15:14:18 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2020-10-30 15:14:18 +0000
commit841eb216644202567ebddfc0badc51a3a35e98c3 (patch)
tree40f930139e5a5fb707c3c3090bd2aabb455dd9cb /lib/sqlalchemy/__init__.py
parent163a97c6d57db09d6405124dae9b877bc9629721 (diff)
parent9ddbd585a62ff1ad56e9ee6fef5898ced1932a88 (diff)
downloadsqlalchemy-841eb216644202567ebddfc0badc51a3a35e98c3.tar.gz
Merge "Apply underscore naming to several more operators"
Diffstat (limited to 'lib/sqlalchemy/__init__.py')
-rw-r--r--lib/sqlalchemy/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index d2c99b5b2..1146803f5 100644
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -61,8 +61,10 @@ from .sql import literal_column # noqa
from .sql import modifier # noqa
from .sql import not_ # noqa
from .sql import null # noqa
-from .sql import nullsfirst # noqa
-from .sql import nullslast # noqa
+from .sql import nullsfirst # noqa; deprecated 1.4; see #5435
+from .sql import nullslast # noqa; deprecated 1.4; see #5435
+from .sql import nulls_first # noqa
+from .sql import nulls_last # noqa
from .sql import or_ # noqa
from .sql import outerjoin # noqa
from .sql import outparam # noqa