Merge pull request #1254 from gpotter2/patch-7

ContextManagerSubprocess fix

Author: p-l-

scapy/arch/windows/__init__.py

@@ -401,9 +401,9 @@ def __init__(self):
         self._reload()
 
     def _reload(self):
+        self.pdfreader = None
+        self.psreader = None
         # We try some magic to find the appropriate executables
-        self.pdfreader = win_find_exe("AcroRd32") 
-        self.psreader = win_find_exe("gsview32")
         self.dot = win_find_exe("dot")
         self.tcpdump = win_find_exe("windump")
         self.tshark = win_find_exe("tshark")

scapy/packet.py

@@ -17,6 +17,7 @@
 from scapy.fields import StrField, ConditionalField, Emph, PacketListField, BitField, \
     MultiEnumField, EnumField, FlagsField
 from scapy.config import conf
+from scapy.consts import WINDOWS
 from scapy.compat import *
 from scapy.base_classes import BasePacket, Gen, SetGen, Packet_metaclass
 from scapy.volatile import VolatileValue
@@ -502,12 +503,16 @@ def psdump(self, filename=None, **kargs):
         """
         canvas = self.canvas_dump(**kargs)
         if filename is None:
-            fname = get_temp_file(autoext=".eps")
+            fname = WINDOWS and get_temp_file(autoext=".eps")
             canvas.writeEPSfile(fname)
-            with ContextManagerSubprocess("psdump()", conf.prog.psreader):
-                subprocess.Popen([conf.prog.psreader, fname])
+            if conf.prog.psreader is None:
+                os.startfile(fname)
+            else:
+                with ContextManagerSubprocess("psdump()", conf.prog.psreader):
+                    subprocess.Popen([conf.prog.psreader, fname])
         else:
             canvas.writeEPSfile(filename)
+        print()
 
     def pdfdump(self, filename=None, **kargs):
         """
@@ -522,10 +527,14 @@ def pdfdump(self, filename=None, **kargs):
         if filename is None:
             fname = get_temp_file(autoext=".pdf")
             canvas.writePDFfile(fname)
-            with ContextManagerSubprocess("pdfdump()", conf.prog.pdfreader):
-                subprocess.Popen([conf.prog.pdfreader, fname])
+            if WINDOWS and conf.prog.pdfreader is None:
+                os.startfile(fname)
+            else:
+                with ContextManagerSubprocess("pdfdump()", conf.prog.pdfreader):
+                    subprocess.Popen([conf.prog.pdfreader, fname])
         else:
             canvas.writePDFfile(filename)
+        print()
 
 
     def canvas_dump(self, layer_shift=0, rebuild=1):

scapy/plist.py

@@ -14,6 +14,7 @@
 from collections import defaultdict
 
 from scapy.config import conf
+from scapy.consts import WINDOWS
 from scapy.base_classes import BasePacket,BasePacketList
 from scapy.utils import do_graph,hexdump,make_table,make_lined_table,make_tex_table, \
     get_temp_file, issubtype
@@ -435,8 +436,11 @@ def psdump(self, filename = None, **kargs):
         if filename is None:
             filename = get_temp_file(autoext=".ps")
             d.writePSfile(filename)
-            with ContextManagerSubprocess("psdump()"):
-                subprocess.Popen([conf.prog.psreader, filename+".ps"])
+            if WINDOWS and conf.prog.psreader is None:
+                os.startfile(filename)
+            else:
+                with ContextManagerSubprocess("psdump()", conf.prog.psreader):
+                    subprocess.Popen([conf.prog.psreader, filename])
         else:
             d.writePSfile(filename)
         print()
@@ -449,8 +453,11 @@ def pdfdump(self, filename = None, **kargs):
         if filename is None:
             filename = get_temp_file(autoext=".pdf")
             d.writePDFfile(filename)
-            with ContextManagerSubprocess("psdump()"):
-                subprocess.Popen([conf.prog.pdfreader, filename+".pdf"])
+            if WINDOWS and conf.prog.pdfreader is None:
+                os.startfile(filename)
+            else:
+                with ContextManagerSubprocess("pdfdump()", conf.prog.pdfreader):
+                    subprocess.Popen([conf.prog.pdfreader, filename])
         else:
             d.writePDFfile(filename)
         print()

scapy/utils.py

@@ -435,7 +435,7 @@ class ContextManagerSubprocess(object):
     Context manager that eases checking for unknown command.
 
     Example:
-    >>> with ContextManagerSubprocess("my custom message"):
+    >>> with ContextManagerSubprocess("my custom message", "unknown_command"):
     >>>     subprocess.Popen(["unknown_command"])
 
     """