openstack
/
magnum
Code Issues Proposed changes

Merge "Fix ignored E711 rule and remove this exception"

This commit is contained in:
Jenkins 2016-01-17 00:15:28 +00:00 committed by Gerrit Code Review
parent b2f57f9606 ab14191218
commit 2748940a29
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
magnum/db/sqlalchemy/api.py
View File

@ -21,6 +21,7 @@ from oslo_db.sqlalchemy import utils as db_utils
from oslo_utils import timeutils
from sqlalchemy.orm.exc import MultipleResultsFound
from sqlalchemy.orm.exc import NoResultFound
from sqlalchemy import sql
from magnum.common import exception
from magnum.common import utils
@ -468,9 +469,9 @@ class Connection(api.Connection):
if 'associated' in filters:
if filters['associated']:
query = query.filter(models.Node.ironic_node_id != None)
query = query.filter(models.Node.ironic_node_id != sql.null())
else:
query = query.filter(models.Node.ironic_node_id == None)
query = query.filter(models.Node.ironic_node_id == sql.null())
if 'type' in filters:
query = query.filter_by(type=filters['type'])
if 'image_id' in filters:

4
magnum/tests/unit/common/cert_manager/test_local.py
View File

@ -60,9 +60,9 @@ class TestLocalManager(base.BaseTestCase):
def _mock_isfile(path):
_, ext = os.path.splitext(path)
if self.intermediates == None and ext == '.int':
if self.intermediates is None and ext == '.int':
return False
if self.private_key_passphrase == None and ext == '.pass':
if self.private_key_passphrase is None and ext == '.pass':
return False
return True
isfile_patcher = mock.patch('os.path.isfile')

3
tox.ini
View File

@ -121,9 +121,6 @@ commands =
--namespace keystonemiddleware.auth_token
[flake8]
# E711 is ignored because it is normal to use "column == None" in sqlalchemy
ignore = E711
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,magnum/common/pythonk8sclient
[hacking]