Fix calling Ndiff from Zenmap on OS X. http://seclists.org/nmap-dev/2016/q3/266

CHANGELOG

@@ -1,5 +1,11 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Zenmap] Fixed a bug in the Compare Scans window of Zenmap on OS X resulting
+  in this message instead of Ndiff output:
+    ImportError: dlopen(/Applications/Zenmap.app/Contents/Resources/lib/python2.7/lib-dynload/datetime.so, 2): no suitable image found.  Did find:
+    /Applications/Zenmap.app/Contents/Resources/lib/python2.7/lib-dynload/datetime.so: mach-o, but wrong architecture
+  Reported by Kyle Gustafson. [Daniel Miller]
+
 o [NSE][GH#369] New script: coap-resources grabs the list of available
   resources from CoAP endpoints. [Mak Kolybabi]
 

zenmap/zenmapCore/Diff.py

@@ -166,11 +166,11 @@ class NdiffCommand(subprocess.Popen):
         search_paths = get_path()
         env = dict(os.environ)
         env["PATH"] = search_paths
-        if getattr(sys, "frozen", None) == "macosx_app":
-            # These variables are set by py2app, but they can interfere with
+        if "Zenmap.app" in sys.executable:
+            # These vars are set by the launcher, but they can interfere with
             # Ndiff because Ndiff is also a Python application. Without
             # removing these, Ndiff will attempt to run using the
-            # py2app-bundled Python library, and may run into version or
+            # bundled Python library, and may run into version or
             # architecture mismatches.
             if "PYTHONPATH" in env:
                 del env["PYTHONPATH"]