From a0f3b93084ee09a06724e335715bfdb735090aec Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Tue, 7 Apr 2020 22:31:50 -0700 Subject: [PATCH] Fix more Python warnings (#869) * Fix "First parameter of a method is not named 'self'" warnings * Fix "Module is imported with 'import' and 'import from'" warning * Fix 'Testing equality to None' warnings * Clean up 'Unused import' warnings --- config/main.py | 1 - config/mlnx.py | 4 ---- config/nat.py | 2 -- connect/main.py | 3 --- consutil/lib.py | 1 - consutil/main.py | 2 -- crm/main.py | 1 - debug/main.py | 2 -- pddf_fanutil/main.py | 7 ------- pddf_ledutil/main.py | 8 -------- pddf_psuutil/main.py | 7 ------- pddf_thermalutil/main.py | 7 ------- pfc/main.py | 3 +-- psuutil/main.py | 2 -- scripts/aclshow | 3 --- scripts/configlet | 4 ---- scripts/db_migrator.py | 3 --- scripts/decode-syseeprom | 8 +------- scripts/dump_nat_entries.py | 1 - scripts/ecnconfig | 1 - scripts/fanshow | 2 -- scripts/fdbclear | 4 +--- scripts/intfstat | 4 ---- scripts/natclear | 3 --- scripts/natconfig | 2 -- scripts/natshow | 1 - scripts/neighbor_advertiser | 2 -- scripts/pfcstat | 3 --- scripts/portconfig | 2 -- scripts/portstat | 3 --- scripts/queuestat | 2 -- scripts/sfpshow | 4 +--- scripts/sonic-kdump-config | 14 ++++++-------- scripts/teamshow | 3 --- scripts/tempershow | 2 -- scripts/update_json.py | 1 - scripts/watermarkstat | 1 - sfputil/main.py | 2 -- show/main.py | 5 ++--- show/mlnx.py | 2 -- sonic-utilities-tests/drops_group_test.py | 3 --- sonic-utilities-tests/intfstat_test.py | 4 ---- sonic-utilities-tests/psu_test.py | 1 + sonic-utilities-tests/sfp_test.py | 1 + sonic_installer/main.py | 2 -- undebug/main.py | 2 -- utilities_common/util_base.py | 2 -- 47 files changed, 14 insertions(+), 133 deletions(-) diff --git a/config/main.py b/config/main.py index e8f89a19ddaf..025346e3a670 100755 --- a/config/main.py +++ b/config/main.py @@ -3,7 +3,6 @@ import sys import os import click -import json import subprocess import netaddr import re diff --git a/config/mlnx.py b/config/mlnx.py index 5ad422d7cf3f..9d7810a6a9f9 100644 --- a/config/mlnx.py +++ b/config/mlnx.py @@ -10,12 +10,8 @@ import os import subprocess import click - import imp import syslog - import types - import traceback import time - from tabulate import tabulate except ImportError as e: raise ImportError("%s - required module not found" % str(e)) diff --git a/config/nat.py b/config/nat.py index 762252eea8df..b56c9d7e52ff 100644 --- a/config/nat.py +++ b/config/nat.py @@ -1,8 +1,6 @@ #!/usr/bin/env python import click -import socket -import netaddr import ipaddress from swsssdk import ConfigDBConnector from swsssdk import SonicV2Connector diff --git a/connect/main.py b/connect/main.py index 9fb7d782bd97..b34ee11aab3f 100755 --- a/connect/main.py +++ b/connect/main.py @@ -1,11 +1,8 @@ #! /usr/bin/python -u import click -import errno import os import pexpect -import subprocess -import sys from click_default_group import DefaultGroup try: diff --git a/consutil/lib.py b/consutil/lib.py index 1955c7763d45..0ffa88691d75 100644 --- a/consutil/lib.py +++ b/consutil/lib.py @@ -8,7 +8,6 @@ try: import click import re - import swsssdk import subprocess import sys except ImportError as e: diff --git a/consutil/main.py b/consutil/main.py index de178ea9a94f..c9a914d47869 100644 --- a/consutil/main.py +++ b/consutil/main.py @@ -9,8 +9,6 @@ import click import os import pexpect - import re - import subprocess import sys from tabulate import tabulate from lib import * diff --git a/crm/main.py b/crm/main.py index 241362ed136d..223029d721ae 100644 --- a/crm/main.py +++ b/crm/main.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -import os import click import swsssdk from tabulate import tabulate diff --git a/debug/main.py b/debug/main.py index 956c72404c3b..b72394b22d7c 100755 --- a/debug/main.py +++ b/debug/main.py @@ -2,10 +2,8 @@ # date: 07/12/17 import click -import os import subprocess from click_default_group import DefaultGroup -from pprint import pprint def run_command(command, pager=False): click.echo(click.style("Command: ", fg='cyan') + click.style(command, fg='green')) diff --git a/pddf_fanutil/main.py b/pddf_fanutil/main.py index 68db948e6302..c34ef4318593 100644 --- a/pddf_fanutil/main.py +++ b/pddf_fanutil/main.py @@ -8,15 +8,8 @@ try: import sys import os - import subprocess import click - import imp - import syslog - import types - import traceback from tabulate import tabulate - from utilities_common import util_base - from utilities_common.util_base import UtilLogger from utilities_common.util_base import UtilHelper except ImportError as e: raise ImportError("%s - required module not found" % str(e)) diff --git a/pddf_ledutil/main.py b/pddf_ledutil/main.py index df471ec8ef88..217781abf042 100644 --- a/pddf_ledutil/main.py +++ b/pddf_ledutil/main.py @@ -8,15 +8,7 @@ try: import sys import os - import subprocess import click - import imp - import syslog - import types - import traceback - from tabulate import tabulate - from utilities_common import util_base - from utilities_common.util_base import UtilLogger from utilities_common.util_base import UtilHelper except ImportError as e: raise ImportError("%s - required module not found" % str(e)) diff --git a/pddf_psuutil/main.py b/pddf_psuutil/main.py index a034f34a0866..14778235fec3 100644 --- a/pddf_psuutil/main.py +++ b/pddf_psuutil/main.py @@ -8,15 +8,8 @@ try: import sys import os - import subprocess import click - import imp - import syslog - import types - import traceback from tabulate import tabulate - from utilities_common import util_base - from utilities_common.util_base import UtilLogger from utilities_common.util_base import UtilHelper except ImportError as e: raise ImportError("%s - required module not found" % str(e)) diff --git a/pddf_thermalutil/main.py b/pddf_thermalutil/main.py index be91273a7bd5..34314ce61170 100644 --- a/pddf_thermalutil/main.py +++ b/pddf_thermalutil/main.py @@ -8,15 +8,8 @@ try: import sys import os - import subprocess import click - import imp - import syslog - import types - import traceback from tabulate import tabulate - from utilities_common import util_base - from utilities_common.util_base import UtilLogger from utilities_common.util_base import UtilHelper except ImportError as e: raise ImportError("%s - required module not found" % str(e)) diff --git a/pfc/main.py b/pfc/main.py index 52ac4ed12294..9da21470706f 100644 --- a/pfc/main.py +++ b/pfc/main.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -import os import click import swsssdk from tabulate import tabulate @@ -160,4 +159,4 @@ def showPrio(interface): config.add_command(configAsym, "asymmetric") config.add_command(configPrio, "priority") show.add_command(showAsym, "asymmetric") -show.add_command(showPrio, "priority") \ No newline at end of file +show.add_command(showPrio, "priority") diff --git a/psuutil/main.py b/psuutil/main.py index fd0b3364362a..3bc09bf42621 100644 --- a/psuutil/main.py +++ b/psuutil/main.py @@ -12,8 +12,6 @@ import click import imp import syslog - import types - import traceback from tabulate import tabulate except ImportError as e: raise ImportError("%s - required module not found" % str(e)) diff --git a/scripts/aclshow b/scripts/aclshow index a574a2325fd6..2c8beeedabca 100755 --- a/scripts/aclshow +++ b/scripts/aclshow @@ -21,13 +21,10 @@ from __future__ import print_function import argparse import json import os -import re -import subprocess import swsssdk import sys from tabulate import tabulate -from natsort import natsorted ### temp file to save counter positions when doing clear counter action. ### if we could have a SAI command to clear counters will be better, so no need to maintain diff --git a/scripts/configlet b/scripts/configlet index 18ee93329453..9837a0362e5c 100755 --- a/scripts/configlet +++ b/scripts/configlet @@ -76,13 +76,9 @@ A sample for update: """ from __future__ import print_function -import sys -import os.path import argparse import json import time -from collections import OrderedDict -from natsort import natsorted from swsssdk import ConfigDBConnector test_only = False diff --git a/scripts/db_migrator.py b/scripts/db_migrator.py index b610a3591260..8d61c292039a 100755 --- a/scripts/db_migrator.py +++ b/scripts/db_migrator.py @@ -6,9 +6,6 @@ import syslog from swsssdk import ConfigDBConnector import sonic_device_util -import os -import subprocess -import json SYSLOG_IDENTIFIER = 'db_migrator' diff --git a/scripts/decode-syseeprom b/scripts/decode-syseeprom index 6ab132409127..e687f4fb689c 100755 --- a/scripts/decode-syseeprom +++ b/scripts/decode-syseeprom @@ -5,17 +5,11 @@ # This is the main script that handles eeprom encoding and decoding # try: - import exceptions - import binascii - import time import optparse import warnings import os - import subprocess import sys - from array import array import imp - from sonic_eeprom import eeprom_dts import glob from sonic_device_util import get_machine_info from sonic_device_util import get_platform_info @@ -55,7 +49,7 @@ def main(): # Currently, don't support eeprom db on Arista platform platforms_without_eeprom_db = ['arista', 'kvm'] if any(platform in platform_path for platform in platforms_without_eeprom_db)\ - or getattr(t, 'read_eeprom_db', None) == None: + or getattr(t, 'read_eeprom_db', None) is None: support_eeprom_db = False # diff --git a/scripts/dump_nat_entries.py b/scripts/dump_nat_entries.py index 0bd1baf1550c..5535394907aa 100644 --- a/scripts/dump_nat_entries.py +++ b/scripts/dump_nat_entries.py @@ -5,7 +5,6 @@ so as to restore them during warm reboot """ -import sys import subprocess def main(): diff --git a/scripts/ecnconfig b/scripts/ecnconfig index 607b983ec6d3..899e6148dfa8 100755 --- a/scripts/ecnconfig +++ b/scripts/ecnconfig @@ -50,7 +50,6 @@ from __future__ import print_function import os import sys -import json import argparse import swsssdk from tabulate import tabulate diff --git a/scripts/fanshow b/scripts/fanshow index 81d0a9e2d8a5..ea6ff3dbd55a 100644 --- a/scripts/fanshow +++ b/scripts/fanshow @@ -4,8 +4,6 @@ """ from __future__ import print_function -import argparse - from tabulate import tabulate from swsssdk import SonicV2Connector from natsort import natsorted diff --git a/scripts/fdbclear b/scripts/fdbclear index a8100af2cb14..de5d380bef29 100644 --- a/scripts/fdbclear +++ b/scripts/fdbclear @@ -15,9 +15,7 @@ import argparse import json import sys -from natsort import natsorted -from swsssdk import SonicV2Connector, port_util -from tabulate import tabulate +from swsssdk import SonicV2Connector class FdbClear(object): diff --git a/scripts/intfstat b/scripts/intfstat index 9341658b5015..c010bbc37410 100755 --- a/scripts/intfstat +++ b/scripts/intfstat @@ -9,12 +9,8 @@ import argparse import cPickle as pickle import datetime -import getopt import sys import os -import json -import re -import subprocess import swsssdk import sys import time diff --git a/scripts/natclear b/scripts/natclear index be4b2060e3c5..7883c8fd6554 100644 --- a/scripts/natclear +++ b/scripts/natclear @@ -12,11 +12,8 @@ import argparse import json import sys -import subprocess -from natsort import natsorted from swsssdk import SonicV2Connector -from tabulate import tabulate class NatClear(object): diff --git a/scripts/natconfig b/scripts/natconfig index d94dc586ac84..b9f7869e55a0 100644 --- a/scripts/natconfig +++ b/scripts/natconfig @@ -39,10 +39,8 @@ """ import argparse -import json import sys -from natsort import natsorted from tabulate import tabulate from swsssdk import ConfigDBConnector diff --git a/scripts/natshow b/scripts/natshow index 3d810d6aae0f..64247501e22c 100644 --- a/scripts/natshow +++ b/scripts/natshow @@ -61,7 +61,6 @@ import json import sys import re -from natsort import natsorted from swsssdk import SonicV2Connector from tabulate import tabulate diff --git a/scripts/neighbor_advertiser b/scripts/neighbor_advertiser index 105f21795b8e..d6f280e7c5f2 100644 --- a/scripts/neighbor_advertiser +++ b/scripts/neighbor_advertiser @@ -17,9 +17,7 @@ import traceback import subprocess import time import warnings -import sonic_device_util from swsssdk import ConfigDBConnector -from swsssdk import SonicV2Connector from netaddr import IPAddress, IPNetwork diff --git a/scripts/pfcstat b/scripts/pfcstat index 0eb135d798b1..3afcb34f727c 100755 --- a/scripts/pfcstat +++ b/scripts/pfcstat @@ -11,10 +11,7 @@ import sys import argparse import cPickle as pickle import datetime -import getopt -import json import os.path -import time from collections import namedtuple, OrderedDict from natsort import natsorted diff --git a/scripts/portconfig b/scripts/portconfig index 07b4828a29ee..6b21739d951b 100755 --- a/scripts/portconfig +++ b/scripts/portconfig @@ -17,9 +17,7 @@ optional arguments: """ from __future__ import print_function -import os import sys -import json import argparse import swsssdk diff --git a/scripts/portstat b/scripts/portstat index 8da9b2778874..29cdbd0c621a 100755 --- a/scripts/portstat +++ b/scripts/portstat @@ -9,10 +9,7 @@ import argparse import cPickle as pickle import datetime -import getopt import os.path -import re -import subprocess import swsssdk import sys import time diff --git a/scripts/queuestat b/scripts/queuestat index b93251ac8dc4..f6e9d2b46627 100755 --- a/scripts/queuestat +++ b/scripts/queuestat @@ -9,8 +9,6 @@ import argparse import cPickle as pickle import datetime -import getopt -import json import os.path import swsssdk import sys diff --git a/scripts/sfpshow b/scripts/sfpshow index 19babf4ccce9..01970b3191cb 100755 --- a/scripts/sfpshow +++ b/scripts/sfpshow @@ -3,8 +3,6 @@ Script to show sfp eeprom and presence status. Not like sfputil this scripts get the sfp data from DB directly. """ -import argparse -import json import sys import click import re @@ -12,7 +10,7 @@ import operator import os from natsort import natsorted -from swsssdk import SonicV2Connector, port_util +from swsssdk import SonicV2Connector from tabulate import tabulate # Mock the redis for unit test purposes # diff --git a/scripts/sonic-kdump-config b/scripts/sonic-kdump-config index eaf5ed3834e7..640dd5d9b55a 100755 --- a/scripts/sonic-kdump-config +++ b/scripts/sonic-kdump-config @@ -19,10 +19,8 @@ limitations under the License. import sys import argparse import shlex -from argparse import RawTextHelpFormatter import os import subprocess -import errno from swsssdk import ConfigDBConnector aboot_cfg_template ="/host/image-%s/kernel-cmdline" @@ -280,7 +278,7 @@ def kdump_enable(verbose, kdump_enabled, memory, num_dumps, image, cmdline_file) crash_kernel_mem = search_for_crash_kernel(lines[img_index]) if verbose: print("crash_kernel_mem=[%s]" % crash_kernel_mem) - if crash_kernel_mem == None: + if crash_kernel_mem is None: lines[img_index] += " crashkernel=%s" % memory changed = True if verbose: @@ -348,7 +346,7 @@ def kdump_disable(verbose, kdump_enabled, memory, num_dumps, image, cmdline_file changed = False crash_kernel_mem = search_for_crash_kernel(lines[img_index]) - if crash_kernel_mem == None: + if crash_kernel_mem is None: print("kdump is already disabled") else: lines[img_index] = lines[img_index].replace("crashkernel="+crash_kernel_mem, "") @@ -388,7 +386,7 @@ def cmd_kdump_disable(verbose, image=get_current_image()): # @param memory If not None, new value to set. # If None, display current value read from running configuration def cmd_kdump_memory(verbose, memory): - if memory == None: + if memory is None: (rc, lines, err_str) = run_command("/usr/bin/show kdump memory", use_shell=False); print('\n'.join(lines)) else: @@ -405,7 +403,7 @@ def cmd_kdump_memory(verbose, memory): # @param memory If not None, new value to set. # If None, display current value read from running configuration def cmd_kdump_num_dumps(verbose, num_dumps): - if num_dumps == None: + if num_dumps is None: (rc, lines, err_str) = run_command("/usr/bin/show kdump num_dumps", use_shell=False); print('\n'.join(lines)) else: @@ -484,7 +482,7 @@ def cmd_kdump_file(num_lines, filename): if x.find(filename) != -1: fname = x break - if fname == None: + if fname is None: print("Invalid key") sys.exit(1) (rc, lines, err_str) = run_command("/usr/bin/tail -n %d %s" % (num_lines, fname), use_shell=False); @@ -500,7 +498,7 @@ def main(): # Add allowed arguments parser = argparse.ArgumentParser(description="kdump configuration and status tool", - formatter_class=RawTextHelpFormatter) + formatter_class=argparse.RawTextHelpFormatter) # Enable kdump on Current image parser.add_argument('--enable', action='store_true', diff --git a/scripts/teamshow b/scripts/teamshow index fa203c8259da..abb48087538e 100755 --- a/scripts/teamshow +++ b/scripts/teamshow @@ -21,14 +21,11 @@ import json import os -import re import swsssdk import subprocess import sys from tabulate import tabulate from natsort import natsorted -from sonic_device_util import get_machine_info -from sonic_device_util import get_platform_info PORT_CHANNEL_APPL_TABLE_PREFIX = "LAG_TABLE:" PORT_CHANNEL_CFG_TABLE_PREFIX = "PORTCHANNEL|" diff --git a/scripts/tempershow b/scripts/tempershow index aabc4943ed9f..23f6da25657f 100644 --- a/scripts/tempershow +++ b/scripts/tempershow @@ -4,8 +4,6 @@ """ from __future__ import print_function -import argparse - from tabulate import tabulate from swsssdk import SonicV2Connector from natsort import natsorted diff --git a/scripts/update_json.py b/scripts/update_json.py index a42603e8fe44..11ea7b8982a2 100755 --- a/scripts/update_json.py +++ b/scripts/update_json.py @@ -1,7 +1,6 @@ #! /usr/bin/env python import os -import sys import json import argparse diff --git a/scripts/watermarkstat b/scripts/watermarkstat index 9b446248dade..8b567ea3b5b4 100644 --- a/scripts/watermarkstat +++ b/scripts/watermarkstat @@ -7,7 +7,6 @@ ##################################################################### import argparse -import getopt import json import sys import swsssdk diff --git a/sfputil/main.py b/sfputil/main.py index 18576ebd5005..654cb8d380fb 100644 --- a/sfputil/main.py +++ b/sfputil/main.py @@ -12,8 +12,6 @@ import click import imp import syslog - import types - import traceback from tabulate import tabulate except ImportError as e: raise ImportError("%s - required module not found" % str(e)) diff --git a/show/main.py b/show/main.py index 6f4267c5ce3b..c4c0d4e49358 100755 --- a/show/main.py +++ b/show/main.py @@ -1,6 +1,5 @@ #! /usr/bin/python -u -import errno import json import netaddr import netifaces @@ -2147,7 +2146,7 @@ def files(): @click.argument('lines', metavar='', required=False) def log(record, lines): """Show kdump kernel core dump file kernel log""" - if lines == None: + if lines is None: run_command("sonic-kdump-config --file %s" % record) else: run_command("sonic-kdump-config --file %s --lines %s" % (record, lines)) @@ -2270,7 +2269,7 @@ def tablelize(keys, data): entry = config_db.get_entry('VLAN_MEMBER', (k, m)) mode = entry.get('tagging_mode') - if mode == None: + if mode is None: r.append('?') else: r.append(mode) diff --git a/show/mlnx.py b/show/mlnx.py index 9ae19002eb55..6b0d304a2791 100644 --- a/show/mlnx.py +++ b/show/mlnx.py @@ -9,8 +9,6 @@ import sys import subprocess import click - import sonic_device_util - from swsssdk import ConfigDBConnector import xml.etree.ElementTree as ET except ImportError as e: raise ImportError("%s - required module not found" % str(e)) diff --git a/sonic-utilities-tests/drops_group_test.py b/sonic-utilities-tests/drops_group_test.py index 6a9e71099c31..df3c6c4f9372 100644 --- a/sonic-utilities-tests/drops_group_test.py +++ b/sonic-utilities-tests/drops_group_test.py @@ -1,8 +1,5 @@ import sys import os -import pytest -import click -import swsssdk from click.testing import CliRunner test_path = os.path.dirname(os.path.abspath(__file__)) diff --git a/sonic-utilities-tests/intfstat_test.py b/sonic-utilities-tests/intfstat_test.py index a3bac6c2cd8c..f1d11e4f844d 100644 --- a/sonic-utilities-tests/intfstat_test.py +++ b/sonic-utilities-tests/intfstat_test.py @@ -1,8 +1,5 @@ import sys import os -import pytest -import click -import swsssdk from click.testing import CliRunner test_path = os.path.dirname(os.path.abspath(__file__)) @@ -12,7 +9,6 @@ sys.path.insert(0, modules_path) import mock_tables.dbconnector - import show.main as show import clear.main as clear diff --git a/sonic-utilities-tests/psu_test.py b/sonic-utilities-tests/psu_test.py index 962b6dbcb9f7..2c8c7e266182 100644 --- a/sonic-utilities-tests/psu_test.py +++ b/sonic-utilities-tests/psu_test.py @@ -42,6 +42,7 @@ def test_single_psu(self): """ assert result.output == expected + @classmethod def teardown_class(cls): print("TEARDOWN") os.environ["PATH"] = os.pathsep.join(os.environ["PATH"].split(os.pathsep)[:-1]) diff --git a/sonic-utilities-tests/sfp_test.py b/sonic-utilities-tests/sfp_test.py index f1cdda6eefba..695258d60b73 100644 --- a/sonic-utilities-tests/sfp_test.py +++ b/sonic-utilities-tests/sfp_test.py @@ -113,6 +113,7 @@ def test_sfp_eeprom(self): expected = "Ethernet200: SFP EEPROM Not detected" assert result_lines == expected + @classmethod def teardown_class(cls): print("TEARDOWN") os.environ["PATH"] = os.pathsep.join(os.environ["PATH"].split(os.pathsep)[:-1]) diff --git a/sonic_installer/main.py b/sonic_installer/main.py index 2f8e81032ca4..1ea71cbd81d1 100644 --- a/sonic_installer/main.py +++ b/sonic_installer/main.py @@ -3,14 +3,12 @@ import os import re import signal -import stat import sys import time import click import urllib import syslog import subprocess -from swsssdk import ConfigDBConnector from swsssdk import SonicV2Connector import collections import platform diff --git a/undebug/main.py b/undebug/main.py index 55f62ebb3f90..a148445f7379 100644 --- a/undebug/main.py +++ b/undebug/main.py @@ -2,10 +2,8 @@ # date: 07/12/17 import click -import os import subprocess from click_default_group import DefaultGroup -from pprint import pprint def run_command(command, pager=False): click.echo(click.style("Command: ", fg='cyan') + click.style(command, fg='green')) diff --git a/utilities_common/util_base.py b/utilities_common/util_base.py index 24c7131d35ac..26598249821f 100644 --- a/utilities_common/util_base.py +++ b/utilities_common/util_base.py @@ -2,10 +2,8 @@ try: import imp - import signal import subprocess import os - import sys import syslog except ImportError as e: raise ImportError (str(e) + " - required module not found")