From aa2abd16a3179df8dae4eb46e423b75739d9ca52 Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Mon, 4 Dec 2017 17:13:38 +0000 Subject: [PATCH] Run autoflake to remove unused imports & variables --- wa/commands/list.py | 3 +-- wa/commands/run.py | 3 +-- wa/framework/configuration/execution.py | 4 ---- wa/framework/entrypoint.py | 4 +--- wa/framework/execution.py | 15 ++------------- wa/framework/getters.py | 3 --- wa/framework/instrumentation.py | 2 +- wa/framework/output.py | 5 +---- wa/framework/plugin.py | 2 +- wa/framework/resource.py | 11 +++-------- wa/framework/run.py | 1 - wa/framework/signal.py | 2 -- wa/framework/target/info.py | 1 - wa/framework/target/manager.py | 1 - wa/framework/target/runtime_parameter_manager.py | 1 - wa/framework/workload.py | 1 - wa/instrumentation/misc.py | 3 +-- wa/instrumentation/trace-cmd.py | 7 ++----- wa/processors/status.py | 1 - wa/processors/uxperf.py | 1 - wa/utils/misc.py | 8 ++------ wa/utils/types.py | 4 +--- wa/workloads/adobereader/__init__.py | 2 +- wa/workloads/applaunch/__init__.py | 6 +----- wa/workloads/exoplayer/__init__.py | 1 - wa/workloads/vellamo/__init__.py | 5 +---- 26 files changed, 20 insertions(+), 77 deletions(-) diff --git a/wa/commands/list.py b/wa/commands/list.py index 540b200f..eba3c87a 100644 --- a/wa/commands/list.py +++ b/wa/commands/list.py @@ -13,9 +13,8 @@ # limitations under the License. # -from wa import Command, settings +from wa import Command from wa.framework import pluginloader -from wa.framework.plugin import PluginLoader from wa.framework.target.descriptor import get_target_descriptions from wa.utils.doc import get_summary from wa.utils.formatter import DescriptionListFormatter diff --git a/wa/commands/run.py b/wa/commands/run.py index 1fcc9944..41d30ad5 100644 --- a/wa/commands/run.py +++ b/wa/commands/run.py @@ -21,8 +21,7 @@ import shutil import wa from wa import Command, settings from wa.framework import pluginloader -from wa.framework.configuration import RunConfiguration -from wa.framework.configuration.parsers import AgendaParser, ConfigParser +from wa.framework.configuration.parsers import AgendaParser from wa.framework.execution import Executor from wa.framework.output import init_run_output from wa.framework.version import get_wa_version diff --git a/wa/framework/configuration/execution.py b/wa/framework/configuration/execution.py index 490df64c..481bec02 100644 --- a/wa/framework/configuration/execution.py +++ b/wa/framework/configuration/execution.py @@ -1,17 +1,13 @@ import random -import logging from itertools import izip_longest, groupby, chain -from wa.framework import pluginloader from wa.framework.configuration.core import (MetaConfiguration, RunConfiguration, JobGenerator, Status, settings) from wa.framework.configuration.parsers import ConfigParser from wa.framework.configuration.plugin_cache import PluginCache from wa.framework.exception import NotFoundError from wa.framework.job import Job -from wa.framework.run import JobState from wa.utils import log -from wa.utils.types import enum class CombinedConfig(object): diff --git a/wa/framework/entrypoint.py b/wa/framework/entrypoint.py index b72fddcc..62fb36b2 100644 --- a/wa/framework/entrypoint.py +++ b/wa/framework/entrypoint.py @@ -18,7 +18,6 @@ import sys import argparse import logging import os -import subprocess import warnings from wa.framework import pluginloader @@ -26,10 +25,9 @@ from wa.framework.command import init_argument_parser from wa.framework.configuration import settings from wa.framework.configuration.execution import ConfigManager from wa.framework.host import init_user_directory -from wa.framework.exception import WAError, DevlibError, ConfigError +from wa.framework.exception import ConfigError from wa.utils import log from wa.utils.doc import format_body -from wa.utils.misc import get_traceback warnings.filterwarnings(action='ignore', category=UserWarning, module='zope') diff --git a/wa/framework/execution.py b/wa/framework/execution.py index 4715eb32..2ec2d568 100644 --- a/wa/framework/execution.py +++ b/wa/framework/execution.py @@ -16,19 +16,12 @@ # pylint: disable=no-member import logging -import os -import random -import subprocess -import uuid -from collections import Counter, defaultdict, OrderedDict -from contextlib import contextmanager from copy import copy from datetime import datetime -from itertools import izip_longest import wa.framework.signal as signal -from wa.framework import instrumentation, pluginloader -from wa.framework.configuration.core import settings, Status +from wa.framework import instrumentation +from wa.framework.configuration.core import Status from wa.framework.exception import (WAError, ConfigError, TimeoutError, InstrumentError, TargetError, HostError, TargetNotRespondingError, WorkloadError) @@ -36,13 +29,10 @@ from wa.framework.job import Job from wa.framework.output import init_job_output from wa.framework.processor import ProcessorManager from wa.framework.resource import ResourceResolver -from wa.framework.run import RunState -from wa.framework.target.info import TargetInfo from wa.framework.target.manager import TargetManager from wa.utils import log from wa.utils.misc import (ensure_directory_exists as _d, merge_config_values, get_traceback, format_duration) -from wa.utils.serializer import json class ExecutionContext(object): @@ -276,7 +266,6 @@ class Executor(object): self.logger = logging.getLogger('executor') self.error_logged = False self.warning_logged = False - pluginloader = None self.target_manager = None self.device = None diff --git a/wa/framework/getters.py b/wa/framework/getters.py index e4572070..c1872452 100644 --- a/wa/framework/getters.py +++ b/wa/framework/getters.py @@ -19,17 +19,14 @@ This module contains the standard set of resource getters used by Workload Autom """ import httplib -import inspect import json import logging import os -import re import shutil import sys import requests -from devlib.utils.android import ApkInfo from wa import Parameter, settings, __file__ as _base_filepath from wa.framework.resource import ResourceGetter, SourcePriority, NO_ONE diff --git a/wa/framework/instrumentation.py b/wa/framework/instrumentation.py index 377cb4cc..42f02301 100644 --- a/wa/framework/instrumentation.py +++ b/wa/framework/instrumentation.py @@ -107,7 +107,7 @@ from wa.framework.plugin import Plugin from wa.framework.exception import (WAError, TargetNotRespondingError, TimeoutError, WorkloadError) from wa.utils.log import log_error -from wa.utils.misc import get_traceback, isiterable +from wa.utils.misc import isiterable from wa.utils.types import identifier, enum, level diff --git a/wa/framework/output.py b/wa/framework/output.py index a0d03c0a..fd1ec308 100644 --- a/wa/framework/output.py +++ b/wa/framework/output.py @@ -1,11 +1,8 @@ import logging import os import shutil -import string -import sys -import uuid from copy import copy -from datetime import datetime, timedelta +from datetime import datetime from wa.framework.configuration.core import JobSpec, Status from wa.framework.configuration.execution import ConfigManager diff --git a/wa/framework/plugin.py b/wa/framework/plugin.py index a2c724f4..b2b6e599 100644 --- a/wa/framework/plugin.py +++ b/wa/framework/plugin.py @@ -31,7 +31,7 @@ from wa.framework.exception import (NotFoundError, PluginLoaderError, TargetErro from wa.utils import log from wa.utils.misc import (ensure_directory_exists as _d, walk_modules, load_class, merge_dicts_simple, get_article) -from wa.utils.types import identifier, boolean +from wa.utils.types import identifier MODNAME_TRANS = string.maketrans(':/\\.', '____') diff --git a/wa/framework/resource.py b/wa/framework/resource.py index ec675772..bd570fa2 100644 --- a/wa/framework/resource.py +++ b/wa/framework/resource.py @@ -12,24 +12,19 @@ # See the License for the specific language governing permissions and # limitations under the License. # -import glob -import inspect import logging import os import re -import shutil -import sys -from collections import defaultdict from devlib.utils.android import ApkInfo from wa.framework import pluginloader -from wa.framework.plugin import Plugin, Parameter +from wa.framework.plugin import Plugin from wa.framework.exception import ResourceError from wa.framework.configuration import settings from wa.utils import log -from wa.utils.misc import ensure_directory_exists as _d, get_object_name -from wa.utils.types import boolean, prioritylist, enum, list_or_string +from wa.utils.misc import get_object_name +from wa.utils.types import enum, list_or_string, prioritylist diff --git a/wa/framework/run.py b/wa/framework/run.py index 5b9f577a..bc8ef05f 100644 --- a/wa/framework/run.py +++ b/wa/framework/run.py @@ -13,7 +13,6 @@ # limitations under the License. # import uuid -import logging from collections import OrderedDict, Counter from copy import copy from datetime import datetime, timedelta diff --git a/wa/framework/signal.py b/wa/framework/signal.py index a852b83a..9ac800cb 100644 --- a/wa/framework/signal.py +++ b/wa/framework/signal.py @@ -342,8 +342,6 @@ def wrapped(signal_name, sender=dispatcher.Anonymous, safe=False): """A decorator for wrapping function in signal dispatch.""" @wrapt.decorator def signal_wrapped(wrapped, instance, args, kwargs): - func_id = repr(wrapped) - def signal_wrapper(*args, **kwargs): with wrap(signal_name, sender, safe): return wrapped(*args, **kwargs) diff --git a/wa/framework/target/info.py b/wa/framework/target/info.py index f3e40119..c7aa921b 100644 --- a/wa/framework/target/info.py +++ b/wa/framework/target/info.py @@ -1,5 +1,4 @@ from devlib import AndroidTarget -from devlib.exception import TargetError from devlib.target import KernelConfig, KernelVersion, Cpuinfo from devlib.utils.android import AndroidProperties diff --git a/wa/framework/target/manager.py b/wa/framework/target/manager.py index 3f9e054e..c737165c 100644 --- a/wa/framework/target/manager.py +++ b/wa/framework/target/manager.py @@ -1,5 +1,4 @@ import logging -import os from wa.framework import signal from wa.framework.plugin import Parameter diff --git a/wa/framework/target/runtime_parameter_manager.py b/wa/framework/target/runtime_parameter_manager.py index 706418a3..1e57dfe5 100644 --- a/wa/framework/target/runtime_parameter_manager.py +++ b/wa/framework/target/runtime_parameter_manager.py @@ -1,4 +1,3 @@ -import re from collections import namedtuple from wa.framework.exception import ConfigError diff --git a/wa/framework/workload.py b/wa/framework/workload.py index 381b9b2d..60777d23 100644 --- a/wa/framework/workload.py +++ b/wa/framework/workload.py @@ -27,7 +27,6 @@ from wa.utils.revent import ReventRecorder from wa.utils.exec_control import once_per_instance from devlib.utils.android import ApkInfo -from devlib.exception import TargetError class Workload(TargetedPlugin): diff --git a/wa/instrumentation/misc.py b/wa/instrumentation/misc.py index 998faf30..3e0854ed 100644 --- a/wa/instrumentation/misc.py +++ b/wa/instrumentation/misc.py @@ -38,10 +38,9 @@ from devlib.exception import TargetError from devlib.utils.android import ApkInfo from wa import Instrument, Parameter, very_fast -from wa.framework import signal from wa.framework.exception import ConfigError from wa.framework.instrumentation import slow -from wa.utils.misc import diff_tokens, write_table, check_output, as_relative +from wa.utils.misc import as_relative, diff_tokens, write_table from wa.utils.misc import ensure_file_directory_exists as _f from wa.utils.misc import ensure_directory_exists as _d from wa.utils.types import list_of_strings diff --git a/wa/instrumentation/trace-cmd.py b/wa/instrumentation/trace-cmd.py index 0943a56c..5e349233 100644 --- a/wa/instrumentation/trace-cmd.py +++ b/wa/instrumentation/trace-cmd.py @@ -17,16 +17,13 @@ # pylint: disable=W0613,E1101 from __future__ import division import os -import time -import subprocess -from collections import defaultdict from devlib import FtraceCollector -from wa import Instrument, Parameter, Executable +from wa import Instrument, Parameter from wa.framework import signal from wa.framework.instrumentation import very_slow -from wa.framework.exception import InstrumentError, ConfigError, TargetError +from wa.framework.exception import InstrumentError from wa.utils.types import list_of_strings from wa.utils.misc import which diff --git a/wa/processors/status.py b/wa/processors/status.py index 9744519f..00b6178e 100644 --- a/wa/processors/status.py +++ b/wa/processors/status.py @@ -15,7 +15,6 @@ # pylint: disable=R0201 -import os import time from collections import Counter diff --git a/wa/processors/uxperf.py b/wa/processors/uxperf.py index aaba902c..f2c2f492 100644 --- a/wa/processors/uxperf.py +++ b/wa/processors/uxperf.py @@ -1,4 +1,3 @@ -import os from wa import ResultProcessor from wa.utils.android import LogcatParser diff --git a/wa/utils/misc.py b/wa/utils/misc.py index 76303dd9..926addfe 100644 --- a/wa/utils/misc.py +++ b/wa/utils/misc.py @@ -25,19 +25,15 @@ import re import math import imp import string -import threading -import signal import subprocess -import pkgutil import traceback import logging import random import hashlib from datetime import datetime, timedelta -from operator import mul, itemgetter +from operator import mul from StringIO import StringIO -from itertools import cycle, groupby, chain -from functools import partial +from itertools import chain, cycle from distutils.spawn import find_executable import yaml diff --git a/wa/utils/types.py b/wa/utils/types.py index aa5cdc8c..db161e9c 100644 --- a/wa/utils/types.py +++ b/wa/utils/types.py @@ -27,10 +27,8 @@ fact that Python is not the best language to use for configuration. """ import os import re -import math import numbers import shlex -import string from bisect import insort from urllib import quote, unquote from collections import defaultdict, MutableMapping @@ -38,7 +36,7 @@ from copy import copy from devlib.utils.types import identifier, boolean, integer, numeric, caseless_string -from wa.utils.misc import isiterable, to_identifier +from wa.utils.misc import isiterable def list_of_strs(value): diff --git a/wa/workloads/adobereader/__init__.py b/wa/workloads/adobereader/__init__.py index 56a3aece..f403d50b 100755 --- a/wa/workloads/adobereader/__init__.py +++ b/wa/workloads/adobereader/__init__.py @@ -16,7 +16,7 @@ import os from wa import ApkUiautoWorkload, Parameter -from wa.utils.types import list_of_strs, numeric +from wa.utils.types import list_of_strs from wa.framework.exception import ValidationError diff --git a/wa/workloads/applaunch/__init__.py b/wa/workloads/applaunch/__init__.py index 5f438e54..9389920d 100644 --- a/wa/workloads/applaunch/__init__.py +++ b/wa/workloads/applaunch/__init__.py @@ -13,14 +13,10 @@ # limitations under the License. # # pylint: disable=attribute-defined-outside-init -import os -from wa import Workload, ApkUiautoWorkload, Parameter, ApkWorkload -from wa import ApkFile, settings +from wa import ApkUiautoWorkload, Parameter from wa.framework import pluginloader -from wa.framework.exception import ConfigError, ResourceError -from devlib.utils.android import ApkInfo class Applaunch(ApkUiautoWorkload): diff --git a/wa/workloads/exoplayer/__init__.py b/wa/workloads/exoplayer/__init__.py index aefa1363..a25d1360 100644 --- a/wa/workloads/exoplayer/__init__.py +++ b/wa/workloads/exoplayer/__init__.py @@ -15,7 +15,6 @@ # limitations under the License. # -from collections import defaultdict import re import os import time diff --git a/wa/workloads/vellamo/__init__.py b/wa/workloads/vellamo/__init__.py index 5e766561..a5c3ade5 100644 --- a/wa/workloads/vellamo/__init__.py +++ b/wa/workloads/vellamo/__init__.py @@ -14,16 +14,13 @@ # import os -import logging import json import re from HTMLParser import HTMLParser -from collections import defaultdict, OrderedDict -from distutils.version import StrictVersion from wa import ApkUiautoWorkload, Parameter -from wa.utils.types import list_of_strs, numeric +from wa.utils.types import list_of_strs from wa.framework.exception import WorkloadError