mirror of
https://github.com/nmap/nmap.git
synced 2025-12-07 13:11:28 +00:00
Fix encoding issues related to Python 3 upgrade.
Python 3 str() is a unicode already, so can't be decoded. subprocess.Popen needs to be in text mode (universal_newlines is the oldest compatible kwarg for this) in order to do line-based buffering. In general, all the filesystem encoding stuff we were doing is done by Python itself now.
This commit is contained in:
@@ -333,7 +333,7 @@ class DiffWindow(Gtk.Window):
|
||||
message_format=_("Error running ndiff"),
|
||||
secondary_text=_(
|
||||
"There was an error running the ndiff program.\n\n"
|
||||
) + str(e).decode(sys.getdefaultencoding(), "replace"))
|
||||
) + str(e))
|
||||
alert.run()
|
||||
alert.destroy()
|
||||
else:
|
||||
@@ -364,7 +364,7 @@ class DiffWindow(Gtk.Window):
|
||||
if status == 0 or status == 1:
|
||||
# Successful completion.
|
||||
try:
|
||||
diff = self.ndiff_process.get_scan_diff().decode("utf-8")
|
||||
diff = self.ndiff_process.get_scan_diff()
|
||||
except zenmapCore.Diff.NdiffParseException as e:
|
||||
alert = HIGAlertDialog(
|
||||
message_format=_("Error parsing ndiff output"),
|
||||
|
||||
Reference in New Issue
Block a user