PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 22:21:29 +00:00
Code Issues Projects Releases Wiki Activity

Closes #342 by thebinarymutant: Fix semantic for python3

Browse Source
This commit is contained in:
vincent
2016-07-01 10:37:25 +00:00
parent 0d12307030
commit d0774e7ed5
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
zenmap/zenmapGUI/DiffCompare.py
View File

@@ -134,7 +134,7 @@ import xml.sax
from zenmapGUI.higwidgets.higdialogs import HIGAlertDialog, HIGDialog from zenmapGUI.higwidgets.higdialogs import HIGAlertDialog, HIGDialog
from zenmapGUI.higwidgets.higboxes import HIGVBox, HIGHBox, \ from zenmapGUI.higwidgets.higboxes import HIGVBox, HIGHBox, \
hig_box_space_holder hig_box_space_holder
from zenmapGUI.higwidgets.higlabels import HIGSectionLabel from zenmapGUI.higwidgets.higlabels import HIGSectionLabel
from zenmapGUI.higwidgets.higtables import HIGTable from zenmapGUI.higwidgets.higtables import HIGTable
from zenmapGUI.higwidgets.higbuttons import HIGButton from zenmapGUI.higwidgets.higbuttons import HIGButton
@@ -214,7 +214,7 @@ class ScanChooser(HIGVBox):
def _attaching_widgets(self): def _attaching_widgets(self):
self.table.attach(self.combo_scan, 0, 1, 0, 1, yoptions=0) self.table.attach(self.combo_scan, 0, 1, 0, 1, yoptions=0)
self.table.attach( self.table.attach(
self.btn_open_scan, 1, 2, 0, 1, yoptions=0, xoptions=0) self.btn_open_scan, 1, 2, 0, 1, yoptions=0, xoptions=0)
self.table.attach(self.exp_scan, 0, 2, 1, 2) self.table.attach(self.exp_scan, 0, 2, 1, 2)
def _set_scrolled(self): def _set_scrolled(self):
@@ -238,7 +238,7 @@ class ScanChooser(HIGVBox):
self.txt_scan_result.set_wrap_mode(gtk.WRAP_WORD) self.txt_scan_result.set_wrap_mode(gtk.WRAP_WORD)
self.txt_scan_result.set_editable(False) self.txt_scan_result.set_editable(False)
self.txt_scan_result.get_buffer().connect( self.txt_scan_result.get_buffer().connect(
"changed", self._text_changed_cb) "changed", self._text_changed_cb)
def _set_open_button(self): def _set_open_button(self):
self.btn_open_scan.connect('clicked', self.open_file) self.btn_open_scan.connect('clicked', self.open_file)
@@ -253,7 +253,7 @@ class ScanChooser(HIGVBox):
try: try:
parser = NmapParser() parser = NmapParser()
parser.parse_file(file_chosen) parser.parse_file(file_chosen)
except xml.sax.SAXParseException, e: except xml.sax.SAXParseException as e:
alert = HIGAlertDialog( alert = HIGAlertDialog(
message_format='<b>%s</b>' % _('Error parsing file'), message_format='<b>%s</b>' % _('Error parsing file'),
secondary_text=_( secondary_text=_(
@@ -262,13 +262,13 @@ class ScanChooser(HIGVBox):
alert.run() alert.run()
alert.destroy() alert.destroy()
return False return False
except Exception, e: except Exception as e:
alert = HIGAlertDialog( alert = HIGAlertDialog(
message_format='<b>%s</b>' % _( message_format='<b>%s</b>' % _(
'Cannot open selected file'), 'Cannot open selected file'),
secondary_text=_("""\ secondary_text=_("""\
This error occurred while trying to open the file: This error occurred while trying to open the file:
%s""") % str(e)) %s""") % str(e))
alert.run() alert.run()
alert.destroy() alert.destroy()
return False return False
@@ -291,7 +291,7 @@ class ScanChooser(HIGVBox):
def _text_changed_cb(self, widget): def _text_changed_cb(self, widget):
buff = self.txt_scan_result.get_buffer() buff = self.txt_scan_result.get_buffer()
buff.apply_tag( buff.apply_tag(
self.txg_tag, buff.get_start_iter(), buff.get_end_iter()) self.txg_tag, buff.get_start_iter(), buff.get_end_iter())
def get_parsed_scan(self): def get_parsed_scan(self):
"""Return the currently selected scan's parsed output as an NmapParser """Return the currently selected scan's parsed output as an NmapParser
@@ -388,7 +388,7 @@ class DiffWindow(gtk.Window):
else: else:
try: try:
self.ndiff_process = zenmapCore.Diff.ndiff(scan_a, scan_b) self.ndiff_process = zenmapCore.Diff.ndiff(scan_a, scan_b)
except OSError, e: except OSError as e:
alert = HIGAlertDialog( alert = HIGAlertDialog(
message_format=_("Error running ndiff"), message_format=_("Error running ndiff"),
secondary_text=_( secondary_text=_(
@@ -400,7 +400,7 @@ class DiffWindow(gtk.Window):
self.progress.show() self.progress.show()
if self.timer_id is None: if self.timer_id is None:
self.timer_id = gobject.timeout_add( self.timer_id = gobject.timeout_add(
NDIFF_CHECK_TIMEOUT, self.check_ndiff_process) NDIFF_CHECK_TIMEOUT, self.check_ndiff_process)
def check_ndiff_process(self): def check_ndiff_process(self):
"""Check if the ndiff subprocess is done and show the diff if it is. """Check if the ndiff subprocess is done and show the diff if it is.
@@ -425,7 +425,7 @@ class DiffWindow(gtk.Window):
# Successful completion. # Successful completion.
try: try:
diff = self.ndiff_process.get_scan_diff() diff = self.ndiff_process.get_scan_diff()
except zenmapCore.Diff.NdiffParseException, e: except zenmapCore.Diff.NdiffParseException as e:
alert = HIGAlertDialog( alert = HIGAlertDialog(
message_format=_("Error parsing ndiff output"), message_format=_("Error parsing ndiff output"),
secondary_text=str(e)) secondary_text=str(e))
@@ -436,8 +436,8 @@ class DiffWindow(gtk.Window):
else: else:
# Unsuccessful completion. # Unsuccessful completion.
error_text = _( error_text = _(
"The ndiff process terminated with status code %d." "The ndiff process terminated with status code %d."
) % status ) % status
stderr = self.ndiff_process.stderr.read() stderr = self.ndiff_process.stderr.read()
if len(stderr) > 0: if len(stderr) > 0:
error_text += "\n\n" + stderr error_text += "\n\n" + stderr
@@ -476,7 +476,7 @@ class DiffView(gtk.TextView):
# Create text markup tags. # Create text markup tags.
buff.create_tag("=", font="Monospace") buff.create_tag("=", font="Monospace")
buff.create_tag( buff.create_tag(
"-", font="Monospace", background=self.REMOVE_COLOR) "-", font="Monospace", background=self.REMOVE_COLOR)
buff.create_tag("+", font="Monospace", background=self.ADD_COLOR) buff.create_tag("+", font="Monospace", background=self.ADD_COLOR)
def clear(self): def clear(self):