diff --git a/.pylintrc b/.pylintrc index 394adcb8b8..5b601709bf 100644 --- a/.pylintrc +++ b/.pylintrc @@ -25,7 +25,6 @@ disable= maybe-no-member, no-member, no-method-argument, - no-name-in-module, no-self-argument, not-callable, no-value-for-parameter, @@ -129,6 +128,10 @@ deprecated-modules= # should use openstack.common.jsonutils json +[TYPECHECK] +# List of module names for which member attributes should not be checked +ignored-modules=six.moves,_MovedItems + [REPORTS] # Tells whether to display a full report or only the messages reports=no diff --git a/neutron/db/sqlalchemyutils.py b/neutron/db/sqlalchemyutils.py index adf0344326..b21edc83e4 100644 --- a/neutron/db/sqlalchemyutils.py +++ b/neutron/db/sqlalchemyutils.py @@ -15,7 +15,7 @@ from six import moves import sqlalchemy -from sqlalchemy.orm.properties import RelationshipProperty +from sqlalchemy.orm import properties from neutron.common import exceptions as n_exc from neutron.openstack.common import log as logging @@ -72,7 +72,7 @@ def paginate_query(query, model, limit, sorts, marker_obj=None): # existed in attr_info, it will be catched at here msg = _("%s is invalid attribute for sort_key") % sort_key raise n_exc.BadRequest(resource=model.__tablename__, msg=msg) - if isinstance(sort_key_attr.property, RelationshipProperty): + if isinstance(sort_key_attr.property, properties.RelationshipProperty): msg = _("The attribute '%(attr)s' is reference to other " "resource, can't used by sort " "'%(resource)s'") % {'attr': sort_key,