Nmap Development mailing list archives

Re: [nmap-svn] r32985 - nmap/zenmap/zenmapGUI


From: Henri Doreau <henri.doreau () gmail com>
Date: Tue, 10 Jun 2014 10:59:09 +0200

2014-06-10 10:21 GMT+02:00  <commit-mailer () nmap org>:
Author: jay
Date: Tue Jun 10 08:21:57 2014
New Revision: 32985

Log:
Updated some code in zenmap/zenmapGUI/DiffCompare.py and zenmap/zenmapGUI/ScanNmapOutputPage.py to work properly with 
the code from r32983


Modified:
   nmap/zenmap/zenmapGUI/DiffCompare.py
   nmap/zenmap/zenmapGUI/ScanNmapOutputPage.py

Modified: nmap/zenmap/zenmapGUI/DiffCompare.py
==============================================================================
--- nmap/zenmap/zenmapGUI/DiffCompare.py        (original)
+++ nmap/zenmap/zenmapGUI/DiffCompare.py        Tue Jun 10 08:21:57 2014
@@ -202,7 +202,7 @@

     def show_scan(self, widget):
         nmap_output = self.get_nmap_output()
-        if nmap_output is not None:
+        if nmap_output != "":
             self.txt_scan_result.get_buffer().set_text(nmap_output)

     def normalize_output(self, output):

Modified: nmap/zenmap/zenmapGUI/ScanNmapOutputPage.py
==============================================================================
--- nmap/zenmap/zenmapGUI/ScanNmapOutputPage.py (original)
+++ nmap/zenmap/zenmapGUI/ScanNmapOutputPage.py Tue Jun 10 08:21:57 2014
@@ -268,7 +268,7 @@
         if entry.parsed is not None:
             self.nmap_output.set_command_execution(None)
             nmap_output = entry.parsed.get_nmap_output()
-            if nmap_output is not None:
+            if nmap_output != "":
                 self.nmap_output.show_nmap_output(nmap_output)
             self.details_button.set_sensitive(True)
         elif entry.command is not None:


"For sequences, (strings, lists, tuples), use the fact that empty
sequences are false." PEP-0008 says[1].

[1] http://legacy.python.org/dev/peps/pep-0008/

-- 
Henri
_______________________________________________
Sent through the dev mailing list
http://nmap.org/mailman/listinfo/dev
Archived at http://seclists.org/nmap-dev/


Current thread: