openstack
/
octavia
Code Issues Proposed changes

Merge "Use sqlalchemy isnot(None)"

This commit is contained in:
Zuul 2020-03-13 08:25:18 +00:00 committed by Gerrit Code Review
parent 6a535c979b 27350a7d65
commit 978d57f3a4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octavia/api/common/pagination.py
View File

@ -345,8 +345,7 @@ class PaginationHelper(object):
default = PaginationHelper._get_default_column_value(
model_attr.property.columns[0].type)
attr = sa_sql.expression.case(
# pylint: disable=singleton-comparison
[(model_attr != None, # noqa E711
[(model_attr.isnot(None),
model_attr), ], else_=default)
crit_attrs.append((attr == marker_values[j]))
@ -354,8 +353,7 @@ class PaginationHelper(object):
default = PaginationHelper._get_default_column_value(
model_attr.property.columns[0].type)
attr = sa_sql.expression.case(
# pylint: disable=singleton-comparison
[(model_attr != None, # noqa E711
[(model_attr.isnot(None),
model_attr), ], else_=default)
this_sort_dir = self.sort_keys[i][1]
if this_sort_dir == constants.DESC: