openstack
/
octavia
Code Issues Proposed changes

Use sqlalchemy isnot(None) 

Instead of using '!= None' and pylint directives use
isnot(None) which should be equivalent.

Change-Id: I63f5fcb3421001e9e7f91b54707f53d2f20281cb
This commit is contained in:
Brian Haley 2020-02-26 16:30:33 -05:00 committed by Michael Johnson
parent c6db3e4f17
commit 27350a7d65
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: