Clean up flake8 for ansible.netcommon collection (#65842)

We noticed the following flake8 errors when we ran the migration script
for ansible.netcommon.

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
pull/64961/merge
Paul Belanger 5 years ago committed by GitHub
parent 0a04a5efc2
commit 093d1500b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -30,7 +30,6 @@ import hashlib
from ansible.module_utils.six.moves import zip from ansible.module_utils.six.moves import zip
from ansible.module_utils._text import to_bytes, to_native from ansible.module_utils._text import to_bytes, to_native
from ansible.module_utils.network.common.utils import to_list
DEFAULT_COMMENT_TOKENS = ['#', '!', '/*', '*/', 'echo'] DEFAULT_COMMENT_TOKENS = ['#', '!', '/*', '*/', 'echo']

@ -35,8 +35,6 @@ import socket
import json import json
from itertools import chain from itertools import chain
from socket import inet_aton
from json import dumps
from ansible.module_utils._text import to_text, to_bytes from ansible.module_utils._text import to_text, to_bytes
from ansible.module_utils.common._collections_compat import Mapping from ansible.module_utils.common._collections_compat import Mapping
@ -45,7 +43,9 @@ from ansible.module_utils import basic
from ansible.module_utils.parsing.convert_bool import boolean from ansible.module_utils.parsing.convert_bool import boolean
# Backwards compatibility for 3rd party modules # Backwards compatibility for 3rd party modules
from ansible.module_utils.common.network import ( # TODO(pabelanger): With move to ansible.netcommon, we should clean this code
# up and have modules import directly themself.
from ansible.module_utils.common.network import ( # noqa: F401
to_bits, is_netmask, is_masklen, to_netmask, to_masklen, to_subnet, to_ipv6_network, VALID_MASKS to_bits, is_netmask, is_masklen, to_netmask, to_masklen, to_subnet, to_ipv6_network, VALID_MASKS
) )

@ -17,7 +17,6 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import copy
import os import os
import re import re
import uuid import uuid
@ -37,7 +36,7 @@ class ActionModule(ActionBase):
def run(self, tmp=None, task_vars=None): def run(self, tmp=None, task_vars=None):
socket_path = None socket_path = None
network_os = self._get_network_os(task_vars) self._get_network_os(task_vars)
persistent_connection = self._play_context.connection.split('.')[-1] persistent_connection = self._play_context.connection.split('.')[-1]
result = super(ActionModule, self).run(task_vars=task_vars) result = super(ActionModule, self).run(task_vars=task_vars)

@ -17,7 +17,6 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import copy
import os import os
import uuid import uuid
import hashlib import hashlib

@ -21,7 +21,6 @@ __metaclass__ = type
import os import os
import time import time
import glob
import re import re
from ansible.errors import AnsibleError from ansible.errors import AnsibleError

@ -329,7 +329,7 @@ class Connection(NetworkConnectionBase):
self._manager._timeout = self.get_option('persistent_command_timeout') self._manager._timeout = self.get_option('persistent_command_timeout')
except SSHUnknownHostError as exc: except SSHUnknownHostError as exc:
raise AnsibleConnectionFailure(to_native(exc)) raise AnsibleConnectionFailure(to_native(exc))
except ImportError as exc: except ImportError:
raise AnsibleError("connection=netconf is not supported on {0}".format(self._network_os)) raise AnsibleError("connection=netconf is not supported on {0}".format(self._network_os))
if not self._manager.connected: if not self._manager.connected:

@ -42,7 +42,6 @@ options:
import json import json
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
from ansible.module_utils.network.common.utils import to_list
from ansible.module_utils.connection import ConnectionError from ansible.module_utils.connection import ConnectionError
from ansible.module_utils.six.moves.urllib.error import HTTPError from ansible.module_utils.six.moves.urllib.error import HTTPError
from ansible.plugins.httpapi import HttpApiBase from ansible.plugins.httpapi import HttpApiBase

@ -21,7 +21,7 @@ __metaclass__ = type
import json import json
from ansible.module_utils._text import to_text, to_bytes from ansible.module_utils._text import to_text
from ansible.plugins.netconf import NetconfBase from ansible.plugins.netconf import NetconfBase

@ -127,7 +127,7 @@ class TestConnectionClass(unittest.TestCase):
""" """
mock__shell.recv.side_effect = [response, None] mock__shell.recv.side_effect = [response, None]
output = conn.send(b'command') conn.send(b'command')
mock__shell.sendall.assert_called_with(b'command\r') mock__shell.sendall.assert_called_with(b'command\r')
self.assertEqual(to_text(conn._command_response), 'command response') self.assertEqual(to_text(conn._command_response), 'command response')

@ -20,8 +20,6 @@ __metaclass__ = type
import os import os
import sys import sys
import pytest
from units.compat import unittest from units.compat import unittest
from ansible.plugins.filter.network import parse_xml, type5_pw, hash_salt, comp_type5, vlan_parser from ansible.plugins.filter.network import parse_xml, type5_pw, hash_salt, comp_type5, vlan_parser
@ -141,7 +139,7 @@ class TestHashSalt(unittest.TestCase):
def test_unparseable_salt(self): def test_unparseable_salt(self):
password = '$nTc1$Z28sUTcWfXlvVe2x.3XAa.' password = '$nTc1$Z28sUTcWfXlvVe2x.3XAa.'
with self.assertRaises(Exception) as e: with self.assertRaises(Exception) as e:
parsed = hash_salt(password) hash_salt(password)
self.assertEqual("Could not parse salt out password correctly from $nTc1$Z28sUTcWfXlvVe2x.3XAa.", str(e.exception)) self.assertEqual("Could not parse salt out password correctly from $nTc1$Z28sUTcWfXlvVe2x.3XAa.", str(e.exception))

Loading…
Cancel
Save