diff --git a/zenmap/radialnet/gui/Application.py b/zenmap/radialnet/gui/Application.py index 4a76b3aa6..f7f5bd969 100644 --- a/zenmap/radialnet/gui/Application.py +++ b/zenmap/radialnet/gui/Application.py @@ -134,8 +134,8 @@ from radialnet.gui.ControlWidget import ControlWidget, ControlFisheye from radialnet.gui.Toolbar import Toolbar from radialnet.gui.Image import Pixmaps import radialnet.gui.RadialNet as RadialNet -from radialnet.bestwidgets.windows import * -from radialnet.bestwidgets.boxes import * +from radialnet.bestwidgets.windows import BWMainWindow, BWAlertDialog +from radialnet.bestwidgets.boxes import BWHBox, BWVBox, BWStatusbar DIMENSION = (640, 480) diff --git a/zenmap/radialnet/gui/HostsViewer.py b/zenmap/radialnet/gui/HostsViewer.py index 10a4232e3..d15742e54 100644 --- a/zenmap/radialnet/gui/HostsViewer.py +++ b/zenmap/radialnet/gui/HostsViewer.py @@ -129,7 +129,7 @@ import re import gtk import gobject -from radialnet.bestwidgets.windows import * +from radialnet.bestwidgets.windows import BWMainWindow from radialnet.gui.NodeNotebook import NodeNotebook from radialnet.util.misc import ipv4_compare diff --git a/zenmap/radialnet/gui/LegendWindow.py b/zenmap/radialnet/gui/LegendWindow.py index 1aa691db2..f662f1594 100644 --- a/zenmap/radialnet/gui/LegendWindow.py +++ b/zenmap/radialnet/gui/LegendWindow.py @@ -132,11 +132,7 @@ import cairo import zenmapCore.I18N # lgtm[py/unused-import] -from radialnet.bestwidgets.windows import * -from radialnet.bestwidgets.boxes import * -from radialnet.bestwidgets.labels import * from radialnet.gui.Image import Pixmaps -from radialnet.util.drawing import * DIMENSION_NORMAL = (350, 450) diff --git a/zenmap/radialnet/gui/NodeNotebook.py b/zenmap/radialnet/gui/NodeNotebook.py index d505a0888..f0f6852a3 100644 --- a/zenmap/radialnet/gui/NodeNotebook.py +++ b/zenmap/radialnet/gui/NodeNotebook.py @@ -129,10 +129,10 @@ import gtk import pango import gobject -from radialnet.bestwidgets.boxes import * +from radialnet.bestwidgets.boxes import BWVBox, BWHBox, BWScrolledWindow, BWTable from radialnet.bestwidgets.expanders import BWExpander -from radialnet.bestwidgets.labels import * -from radialnet.bestwidgets.textview import * +from radialnet.bestwidgets.labels import BWLabel, BWSectionLabel +from radialnet.bestwidgets.textview import BWTextEditor import zenmapCore.I18N # lgtm[py/unused-import] diff --git a/zenmap/radialnet/gui/NodeWindow.py b/zenmap/radialnet/gui/NodeWindow.py index 695e703a5..fc6409167 100644 --- a/zenmap/radialnet/gui/NodeWindow.py +++ b/zenmap/radialnet/gui/NodeWindow.py @@ -130,9 +130,9 @@ import pango import radialnet.util.drawing as drawing -from radialnet.bestwidgets.windows import * -from radialnet.bestwidgets.boxes import * -from radialnet.bestwidgets.labels import * +from radialnet.bestwidgets.windows import BWWindow +from radialnet.bestwidgets.boxes import BWVBox, BWHBox +from radialnet.bestwidgets.labels import BWSectionLabel from radialnet.gui.Image import Application from radialnet.gui.NodeNotebook import NodeNotebook diff --git a/zenmap/radialnet/gui/Toolbar.py b/zenmap/radialnet/gui/Toolbar.py index a1efbb28b..b8180341d 100644 --- a/zenmap/radialnet/gui/Toolbar.py +++ b/zenmap/radialnet/gui/Toolbar.py @@ -127,7 +127,7 @@ import gtk -from radialnet.bestwidgets.buttons import * +from radialnet.bestwidgets.buttons import BWStockButton, BWToggleStockButton from radialnet.gui.SaveDialog import SaveDialog from radialnet.gui.Dialogs import AboutDialog from radialnet.gui.LegendWindow import LegendWindow diff --git a/zenmap/radialnet/radialnet.pyw b/zenmap/radialnet/radialnet.pyw index ff9fd211e..98ccf9031 100755 --- a/zenmap/radialnet/radialnet.pyw +++ b/zenmap/radialnet/radialnet.pyw @@ -129,8 +129,8 @@ import os import sys -from core.ArgvHandle import * -from gui.Application import * +from core.ArgvHandle import ArgvHandle +from gui.Application import Application USAGE = """\ diff --git a/zenmap/radialnet/util/integration.py b/zenmap/radialnet/util/integration.py index e1c7ba3a0..9ceef1e5f 100644 --- a/zenmap/radialnet/util/integration.py +++ b/zenmap/radialnet/util/integration.py @@ -125,7 +125,7 @@ # * * # ***************************************************************************/ -from radialnet.core.Graph import * +from radialnet.core.Graph import Graph from radialnet.gui.RadialNet import NetNode import math diff --git a/zenmap/radialnet/util/misc.py b/zenmap/radialnet/util/misc.py index 59af5edc0..4cc41c4f7 100644 --- a/zenmap/radialnet/util/misc.py +++ b/zenmap/radialnet/util/misc.py @@ -126,7 +126,7 @@ # ***************************************************************************/ from radialnet.core.Coordinate import CartesianCoordinate -from radialnet.util.geometry import * +from radialnet.util.geometry import normalize_angle import math diff --git a/zenmap/zenmapGUI/MainWindow.py b/zenmap/zenmapGUI/MainWindow.py index 019830135..d0eaeeb1e 100644 --- a/zenmap/zenmapGUI/MainWindow.py +++ b/zenmap/zenmapGUI/MainWindow.py @@ -144,7 +144,9 @@ from zenmapGUI.higwidgets.higlabels import HIGEntryLabel from zenmapGUI.higwidgets.higboxes import HIGHBox, HIGVBox import zenmapGUI.App -from zenmapGUI.FileChoosers import * +from zenmapGUI.FileChoosers import RESPONSE_OPEN_DIRECTORY, \ + ResultsFileChooserDialog, SaveResultsFileChooserDialog, \ + SaveToDirectoryChooserDialog from zenmapGUI.ScanInterface import ScanInterface from zenmapGUI.ProfileEditor import ProfileEditor from zenmapGUI.About import About diff --git a/zenmap/zenmapGUI/OptionBuilder.py b/zenmap/zenmapGUI/OptionBuilder.py index 5bd400b98..c041c261a 100644 --- a/zenmap/zenmapGUI/OptionBuilder.py +++ b/zenmap/zenmapGUI/OptionBuilder.py @@ -144,7 +144,7 @@ from zenmapGUI.ProfileHelp import ProfileHelp from zenmapCore.NmapOptions import NmapOptions, split_quoted, join_quoted import zenmapCore.I18N # lgtm[py/unused-import] -from zenmapGUI.ScriptInterface import * +from zenmapGUI.ScriptInterface import ScriptInterface def get_option_check_auxiliary_widget(option, ops, check): diff --git a/zenmap/zenmapGUI/ProfileEditor.py b/zenmap/zenmapGUI/ProfileEditor.py index fe4d85142..653f148ba 100644 --- a/zenmap/zenmapGUI/ProfileEditor.py +++ b/zenmap/zenmapGUI/ProfileEditor.py @@ -137,7 +137,7 @@ from zenmapGUI.higwidgets.higtextviewers import HIGTextView from zenmapGUI.higwidgets.higbuttons import HIGButton from zenmapGUI.higwidgets.higtables import HIGTable from zenmapGUI.higwidgets.higdialogs import HIGAlertDialog, HIGDialog -from zenmapGUI.OptionBuilder import * +from zenmapGUI.OptionBuilder import OptionBuilder from zenmapCore.Paths import Path from zenmapCore.UmitConf import CommandProfile from zenmapCore.UmitLogging import log diff --git a/zenmap/zenmapGUI/ScriptInterface.py b/zenmap/zenmapGUI/ScriptInterface.py index b22f288f1..1e1656cce 100644 --- a/zenmap/zenmapGUI/ScriptInterface.py +++ b/zenmap/zenmapGUI/ScriptInterface.py @@ -141,7 +141,7 @@ import xml.sax from zenmapGUI.higwidgets.higboxes import HIGVBox, HIGHBox from zenmapGUI.higwidgets.higscrollers import HIGScrolledWindow from zenmapGUI.higwidgets.higbuttons import HIGButton -from zenmapCore.ScriptMetadata import * +from zenmapCore.ScriptMetadata import get_script_entries from zenmapCore.ScriptArgsParser import parse_script_args_dict from zenmapCore.NmapCommand import NmapCommand from zenmapCore.NmapOptions import NmapOptions diff --git a/zenmap/zenmapGUI/TopologyPage.py b/zenmap/zenmapGUI/TopologyPage.py index a6b7882ac..8fd97e7ec 100644 --- a/zenmap/zenmapGUI/TopologyPage.py +++ b/zenmap/zenmapGUI/TopologyPage.py @@ -128,15 +128,11 @@ import gtk -from zenmapGUI.ScanToolbar import * - from zenmapGUI.higwidgets.higboxes import HIGVBox import radialnet.gui.RadialNet as RadialNet -from radialnet.gui.ControlWidget import * +from radialnet.gui.ControlWidget import ControlWidget, ControlFisheye from radialnet.gui.Toolbar import Toolbar -from radialnet.bestwidgets.boxes import * -from radialnet.bestwidgets.windows import * from radialnet.util.integration import make_graph_from_hosts diff --git a/zenmap/zenmapGUI/higwidgets/higentries.py b/zenmap/zenmapGUI/higwidgets/higentries.py index 693b949bb..4ea6b763e 100644 --- a/zenmap/zenmapGUI/higwidgets/higentries.py +++ b/zenmap/zenmapGUI/higwidgets/higentries.py @@ -134,6 +134,8 @@ higwidgets/higentries.py import gtk +__all__ = ('HIGTextEntry', 'HIGPasswordEntry') + HIGTextEntry = gtk.Entry diff --git a/zenmap/zenmapGUI/higwidgets/higwindows.py b/zenmap/zenmapGUI/higwidgets/higwindows.py index fb9eff238..ad4b119bf 100644 --- a/zenmap/zenmapGUI/higwidgets/higwindows.py +++ b/zenmap/zenmapGUI/higwidgets/higwindows.py @@ -134,6 +134,8 @@ higwidgets/higwindows.py import gtk +__all__ = ('HIGWindow', 'HIGMainWindow') + class HIGWindow(gtk.Window): """HIGFied Window"""