PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-12 02:39:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge #2088: Update Zenmap to Python 3 and PyGObject

Browse Source 
Note: Ndiff build will be broken until subsequent changes are made.
Deprecation warnings will need to be addressed in future changes.
Closes #2088
This commit is contained in:
dmiller
2022-12-07 20:34:03 +00:00
parent e2e55660c3
commit 24b26317c7
104 changed files with 5381 additions and 4383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
zenmap/radialnet/gui/HostsViewer.py
View File

@@ -57,9 +57,12 @@
# * *
# ***************************************************************************/
import gi
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk
import re
import gtk
import gobject
from radialnet.bestwidgets.windows import BWMainWindow
@@ -73,7 +76,7 @@ HOSTS_HEADER = ['ID', '#', 'Hosts']
DIMENSION = (700, 400)
IP_RE = re.compile('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$')
IP_RE = re.compile(r'^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$')
class HostsViewer(BWMainWindow):
@@ -87,7 +90,7 @@ class HostsViewer(BWMainWindow):
self.set_default_size(DIMENSION[0], DIMENSION[1])
self.__nodes = nodes
self.__default_view = gtk.Label(_("No node selected"))
self.__default_view = Gtk.Label.new(_("No node selected"))
self.__view = self.__default_view
self.__create_widgets()
@@ -95,7 +98,7 @@ class HostsViewer(BWMainWindow):
def __create_widgets(self):
"""
"""
self.__panel = gtk.HPaned()
self.__panel = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
self.__panel.set_border_width(6)
self.__list = HostsList(self, self.__nodes)
@@ -121,15 +124,15 @@ class HostsViewer(BWMainWindow):
self.__panel.add2(self.__view)
class HostsList(gtk.ScrolledWindow):
class HostsList(Gtk.ScrolledWindow):
"""
"""
def __init__(self, parent, nodes):
"""
"""
super(HostsList, self).__init__()
self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
self.set_shadow_type(gtk.SHADOW_NONE)
self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
self.set_shadow_type(Gtk.ShadowType.NONE)
self.__parent = parent
self.__nodes = nodes
@@ -139,15 +142,11 @@ class HostsList(gtk.ScrolledWindow):
def __create_widgets(self):
"""
"""
self.__cell = gtk.CellRendererText()
self.__cell = Gtk.CellRendererText()
self.__hosts_store = gtk.ListStore(gobject.TYPE_INT,
gobject.TYPE_INT,
gobject.TYPE_STRING,
gobject.TYPE_STRING,
gobject.TYPE_BOOLEAN)
self.__hosts_store = Gtk.ListStore.new([int, int, str, str, bool])
self.__hosts_treeview = gtk.TreeView(self.__hosts_store)
self.__hosts_treeview = Gtk.TreeView.new_with_model(self.__hosts_store)
self.__hosts_treeview.connect('cursor-changed', self.__cursor_callback)
for i in range(len(self.__nodes)):
@@ -169,8 +168,8 @@ class HostsList(gtk.ScrolledWindow):
for i in range(0, len(HOSTS_HEADER)):
column = gtk.TreeViewColumn(HOSTS_HEADER[i],
self.__cell,
column = Gtk.TreeViewColumn(title=HOSTS_HEADER[i],
cell_renderer=self.__cell,
text=i)
self.__hosts_column.append(column)
@@ -207,7 +206,7 @@ class HostsList(gtk.ScrolledWindow):
self.__parent.change_notebook(node)
def __host_sort(self, treemodel, iter1, iter2):
def __host_sort(self, treemodel, iter1, iter2, *_):
"""
"""
value1 = treemodel.get_value(iter1, 2)