From dcca3b46e3cb0dead31e08b9efcbdbb15f6e5ee0 Mon Sep 17 00:00:00 2001 From: Cody Scott Date: Fri, 9 Jun 2023 06:41:32 -0400 Subject: [PATCH] Remove more import * --- examples/DataPublisher/datapublisher/agent.py | 3 ++- volttron/platform/auth/auth_protocols/auth_rmq.py | 3 ++- volttron/platform/auth/auth_protocols/auth_zmq.py | 3 ++- volttron/platform/packaging.py | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/examples/DataPublisher/datapublisher/agent.py b/examples/DataPublisher/datapublisher/agent.py index b461c1911c..c825063447 100644 --- a/examples/DataPublisher/datapublisher/agent.py +++ b/examples/DataPublisher/datapublisher/agent.py @@ -41,14 +41,15 @@ import re import sys -from volttron.platform.vip.agent import * from volttron.platform.agent import utils from volttron.platform.messaging.utils import normtopic from volttron.platform.messaging import headers as headers_mod +from volttron.platform.vip.agent import Agent, RPC import gevent from collections import defaultdict + utils.setup_logging() _log = logging.getLogger(__name__) __version__ = '4.0.0' diff --git a/volttron/platform/auth/auth_protocols/auth_rmq.py b/volttron/platform/auth/auth_protocols/auth_rmq.py index c815697bf7..17f4efd0ff 100644 --- a/volttron/platform/auth/auth_protocols/auth_rmq.py +++ b/volttron/platform/auth/auth_protocols/auth_rmq.py @@ -7,7 +7,8 @@ from urllib.parse import urlparse, urlsplit from dataclasses import dataclass from volttron.platform.auth import certs -from volttron.platform.auth.auth_protocols import * +from volttron.platform.auth.auth_protocols import ( + BaseAuthentication, BaseClientAuthorization, BaseServerAuthentication, BaseServerAuthorization) from volttron.platform.parameters import Parameters from volttron.utils.rmq_mgmt import RabbitMQMgmt from volttron.platform import jsonapi diff --git a/volttron/platform/auth/auth_protocols/auth_zmq.py b/volttron/platform/auth/auth_protocols/auth_zmq.py index dda4edf067..0b5ec356ba 100644 --- a/volttron/platform/auth/auth_protocols/auth_zmq.py +++ b/volttron/platform/auth/auth_protocols/auth_zmq.py @@ -46,11 +46,12 @@ import gevent import gevent.time from zmq import green as zmq -from volttron.platform.auth.auth_protocols import * from volttron.platform import get_home from volttron.platform import jsonapi from volttron.platform.auth.auth_entry import AuthEntry from volttron.platform.auth.auth_exception import AuthException +from volttron.platform.auth.auth_protocols import ( + BaseAuthentication, BaseClientAuthorization, BaseServerAuthentication, BaseServerAuthorization) from volttron.platform.auth.auth_utils import dump_user from volttron.platform.keystore import KeyStore, KnownHostsStore from volttron.platform.parameters import Parameters diff --git a/volttron/platform/packaging.py b/volttron/platform/packaging.py index b575e63103..ce033dfb8a 100644 --- a/volttron/platform/packaging.py +++ b/volttron/platform/packaging.py @@ -50,9 +50,9 @@ import errno from wheel.install import WheelFile -from volttron.platform.packages import * from volttron.platform.agent import utils from volttron.platform import get_volttron_data, get_home +from volttron.platform.packages import UnpackedPackage, VolttronPackageWheelFileNoSign from volttron.utils.prompt import prompt_response from volttron.platform.auth import certs from volttron.platform import config