Enable additional pylint rules and resolve issues found. (#47221)

* Resolve unneeded-not.
* Resolve global-at-module-level.
* Resolve useless-import-alias.
* Resolve bad-whitespace.
* Resolve global-variable-not-assigned.
* Resolve logging-not-lazy.
* Resolve comparison-with-itself.
This commit is contained in:
Matt Clay
2018-10-18 13:38:08 -07:00
committed by GitHub
parent 77d32b8f57
commit 37b013aca3
29 changed files with 42 additions and 53 deletions

View File

@@ -29,7 +29,7 @@ class GCPRequestDifferenceTestCase(unittest.TestCase):
'test': 'original'
}
request = GcpRequest(value1)
self.assertEquals(request == request, True)
self.assertEquals(request, request)
def test_simple_different(self):
value1 = {
@@ -45,7 +45,7 @@ class GCPRequestDifferenceTestCase(unittest.TestCase):
}
request1 = GcpRequest(value1)
request2 = GcpRequest(value2)
self.assertEquals(request1 == request2, False)
self.assertNotEquals(request1, request2)
self.assertEquals(request1.difference(request2), difference)
def test_nested_dictionaries_no_difference(self):
@@ -59,7 +59,7 @@ class GCPRequestDifferenceTestCase(unittest.TestCase):
'test': 'original'
}
request = GcpRequest(value1)
self.assertEquals(request == request, True)
self.assertEquals(request, request)
def test_nested_dictionaries_with_difference(self):
value1 = {
@@ -90,7 +90,7 @@ class GCPRequestDifferenceTestCase(unittest.TestCase):
}
request1 = GcpRequest(value1)
request2 = GcpRequest(value2)
self.assertEquals(request1 == request2, False)
self.assertNotEquals(request1, request2)
self.assertEquals(request1.difference(request2), difference)
def test_arrays_strings_no_difference(self):
@@ -101,7 +101,7 @@ class GCPRequestDifferenceTestCase(unittest.TestCase):
]
}
request = GcpRequest(value1)
self.assertEquals(request == request, True)
self.assertEquals(request, request)
def test_arrays_strings_with_difference(self):
value1 = {
@@ -124,7 +124,7 @@ class GCPRequestDifferenceTestCase(unittest.TestCase):
}
request1 = GcpRequest(value1)
request2 = GcpRequest(value2)
self.assertEquals(request1 == request2, False)
self.assertNotEquals(request1, request2)
self.assertEquals(request1.difference(request2), difference)
def test_arrays_dicts_with_no_difference(self):
@@ -140,7 +140,7 @@ class GCPRequestDifferenceTestCase(unittest.TestCase):
]
}
request = GcpRequest(value1)
self.assertEquals(request == request, True)
self.assertEquals(request, request)
def test_arrays_dicts_with_difference(self):
value1 = {
@@ -172,5 +172,5 @@ class GCPRequestDifferenceTestCase(unittest.TestCase):
}
request1 = GcpRequest(value1)
request2 = GcpRequest(value2)
self.assertEquals(request1 == request2, False)
self.assertNotEquals(request1, request2)
self.assertEquals(request1.difference(request2), difference)

View File

@@ -31,7 +31,7 @@ if not HAS_BOTO3:
pytestmark = pytest.mark.skip("test_api_gateway.py requires the `boto3` and `botocore` modules")
import ansible.modules.cloud.amazon.aws_api_gateway as agw
import ansible.module_utils.aws.core as core
from ansible.module_utils.aws import core
exit_return_dict = {}

View File

@@ -4,7 +4,7 @@ import unittest
boto3 = pytest.importorskip("boto3")
botocore = pytest.importorskip("botocore")
import ansible.modules.cloud.amazon.kinesis_stream as kinesis_stream
from ansible.modules.cloud.amazon import kinesis_stream
aws_region = 'us-west-2'

View File

@@ -31,7 +31,7 @@ if not HAS_BOTO3:
pytestmark = pytest.mark.skip("test_api_gateway.py requires the `boto3` and `botocore` modules")
# these are here cause ... boto!
import ansible.modules.cloud.amazon.lambda_policy as lambda_policy
from ansible.modules.cloud.amazon import lambda_policy
from ansible.modules.cloud.amazon.lambda_policy import setup_module_object
try:
from botocore.exceptions import ClientError

View File

@@ -35,7 +35,7 @@ def params_from_doc(func):
return cfg[0]['os_server']
class FakeCloud (object):
class FakeCloud(object):
ports = [
{'name': 'port1', 'id': '1234'},
{'name': 'port2', 'id': '4321'},

View File

@@ -20,7 +20,7 @@ import sys
sys.modules['cvprac'] = Mock()
sys.modules['cvprac.cvp_client'] = Mock()
sys.modules['cvprac.cvp_client_errors'] = Mock()
import ansible.modules.network.cloudvision.cv_server_provision as cv_server_provision
from ansible.modules.network.cloudvision import cv_server_provision
class MockException(BaseException):

View File

@@ -48,7 +48,7 @@ MODULE_RESULT = {"msg": "Requested actions were successfully performed on all de
@patch('vdirect_client.rest_client.RestClient')
class RestClient ():
class RestClient:
def __init__(self, vdirect_ip=None, vdirect_user=None, vdirect_password=None, wait=None,
secondary_vdirect_ip=None, https_port=None, http_port=None,
timeout=None, https=None, strict_http_results=None,
@@ -56,7 +56,7 @@ class RestClient ():
pass
class DeviceMock ():
class DeviceMock:
def __init__(self, name, client):
self.name = name

View File

@@ -35,7 +35,7 @@ NONE_PARAMS = {'vdirect_ip': None, 'vdirect_user': None, 'vdirect_password': Non
@patch('vdirect_client.rest_client.RestClient')
class RestClient ():
class RestClient:
def __init__(self, vdirect_ip=None, vdirect_user=None, vdirect_password=None, wait=None,
secondary_vdirect_ip=None, https_port=None, http_port=None,
timeout=None, https=None, strict_http_results=None,
@@ -44,7 +44,7 @@ class RestClient ():
@patch('vdirect_client.rest_client.Template')
class Template ():
class Template:
create_from_source_result = None
upload_source_result = None
@@ -67,7 +67,7 @@ class Template ():
@patch('vdirect_client.rest_client.WorkflowTemplate')
class WorkflowTemplate ():
class WorkflowTemplate:
create_template_from_archive_result = None
update_archive_result = None

View File

@@ -47,7 +47,7 @@ MODULE_RESULT = {"msg": "Configuration template run completed.", "parameters": {
@patch('vdirect_client.rest_client.RestClient')
class RestClient ():
class RestClient:
def __init__(self, vdirect_ip=None, vdirect_user=None, vdirect_password=None, wait=None,
secondary_vdirect_ip=None, https_port=None, http_port=None,
timeout=None, https=None, strict_http_results=None,
@@ -56,7 +56,7 @@ class RestClient ():
@patch('vdirect_client.rest_client.Runnable')
class Runnable ():
class Runnable:
available_actions_result = None
action_info_result = None
runnable_objects_result = None

View File

@@ -1,6 +1,6 @@
import os
import tempfile
import ansible.module_utils.basic as basic
from ansible.module_utils import basic
from units.compat import unittest
from ansible.module_utils._text import to_bytes

View File

@@ -24,7 +24,7 @@ from copy import copy
from ansible.errors import AnsibleError
import ansible.plugins.lookup.aws_ssm as aws_ssm
from ansible.plugins.lookup import aws_ssm
try:
import boto3