diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-06 13:20:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-06 13:20:15 +0000 |
| commit | 03f33d67d756e8f48427b79e3e34fe7b8fc546d8 (patch) | |
| tree | 9e94d5a552117a437aeb7ddaa79624c80a643210 | |
| parent | 41d7fa4012237b28333118834740ff3141da41f7 (diff) | |
| parent | 73c9a5fc7c0ed9758af28e7061428544b2475af0 (diff) | |
| download | neutron-03f33d67d756e8f48427b79e3e34fe7b8fc546d8.tar.gz | |
Merge "Enable the "not-callable" pylint check"
| -rw-r--r-- | .pylintrc | 1 | ||||
| -rw-r--r-- | neutron/agent/securitygroups_rpc.py | 3 | ||||
| -rw-r--r-- | neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py | 1 | ||||
| -rw-r--r-- | neutron/services/l3_router/l3_apic.py | 1 |
4 files changed, 4 insertions, 2 deletions
@@ -24,7 +24,6 @@ disable= no-member, no-method-argument, no-self-argument, - not-callable, no-value-for-parameter, super-on-old-class, # "W" Warnings for stylistic problems or minor programming issues diff --git a/neutron/agent/securitygroups_rpc.py b/neutron/agent/securitygroups_rpc.py index 7681b31ead..fe67851060 100644 --- a/neutron/agent/securitygroups_rpc.py +++ b/neutron/agent/securitygroups_rpc.py @@ -197,7 +197,8 @@ class SecurityGroupAgentRpcMixin(object): "or configured as NoopFirewallDriver."), func.__name__) else: - return func(self, *args, **kwargs) + return func(self, # pylint: disable=not-callable + *args, **kwargs) return decorated_function @skip_if_noopfirewall_or_firewall_disabled diff --git a/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py b/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py index c9ef932026..661b869088 100644 --- a/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py +++ b/neutron/plugins/ml2/drivers/cisco/apic/mechanism_apic.py @@ -79,6 +79,7 @@ class APICMechanismDriver(api.MechanismDriver): inst.synchronizer = ( APICMechanismDriver.get_base_synchronizer(inst)) inst.synchronizer.sync_base() + # pylint: disable=not-callable return f(inst, *args, **kwargs) return inner diff --git a/neutron/services/l3_router/l3_apic.py b/neutron/services/l3_router/l3_apic.py index c4139a6510..82ecb706cc 100644 --- a/neutron/services/l3_router/l3_apic.py +++ b/neutron/services/l3_router/l3_apic.py @@ -63,6 +63,7 @@ class ApicL3ServicePlugin(db_base_plugin_v2.NeutronDbPluginV2, mechanism_apic.APICMechanismDriver. get_router_synchronizer(inst)) inst.synchronizer.sync_router() + # pylint: disable=not-callable return f(inst, *args, **kwargs) return inner |