Enable no-name-in-module pylint check

Add _MovedItems (from six.moves) to pylintrc ignored-modules, and adjust
one import of sqlalchemy.orm.properties.RelationshipProperty.

s.o.p.RelationshipProperty is created at import-time in a rather
exciting manner - rearranging the import in this way forces the
import-time code to be executed and seems sufficient to satisfy the
pylint static check.

Change-Id: Ic99dc2b7dfac75930a5c446ae899eaae09ee6174
This commit is contained in:
Angus Lees 2014-10-22 09:24:21 +11:00
parent 0c1223862c
commit bf77548aef
2 changed files with 6 additions and 3 deletions

View File

@ -25,7 +25,6 @@ disable=
maybe-no-member, maybe-no-member,
no-member, no-member,
no-method-argument, no-method-argument,
no-name-in-module,
no-self-argument, no-self-argument,
not-callable, not-callable,
no-value-for-parameter, no-value-for-parameter,
@ -130,6 +129,10 @@ deprecated-modules=
# should use openstack.common.jsonutils # should use openstack.common.jsonutils
json json
[TYPECHECK]
# List of module names for which member attributes should not be checked
ignored-modules=six.moves,_MovedItems
[REPORTS] [REPORTS]
# Tells whether to display a full report or only the messages # Tells whether to display a full report or only the messages
reports=no reports=no

View File

@ -15,7 +15,7 @@
from six import moves from six import moves
import sqlalchemy import sqlalchemy
from sqlalchemy.orm.properties import RelationshipProperty from sqlalchemy.orm import properties
from neutron.common import exceptions as n_exc from neutron.common import exceptions as n_exc
from neutron.openstack.common import log as logging 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 # existed in attr_info, it will be catched at here
msg = _("%s is invalid attribute for sort_key") % sort_key msg = _("%s is invalid attribute for sort_key") % sort_key
raise n_exc.BadRequest(resource=model.__tablename__, msg=msg) 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 " msg = _("The attribute '%(attr)s' is reference to other "
"resource, can't used by sort " "resource, can't used by sort "
"'%(resource)s'") % {'attr': sort_key, "'%(resource)s'") % {'attr': sort_key,