Open stdout and stderr as text streams

rcarrillo · rcarrillo · commit cadfa06ec9f1 · 2016-02-26T20:09:27.000-05:00
Nmap stdout and sterr is being used as str. This opens the streams as text, so read()/readline() returns a str instead of a byte, avoiding the need to manually decode from str to byte on each read(). This fixes savon-noir#63 which is an endless loop caused by enumerate() waiting for a '' as sentinel but receiving a b''. Also, NmapProcess.__process_event() expects stderr as str, using a byte breaks it, which in turn breaks NmapProcess.run_background() and NmapProcess.sudo_run_background()
diff --git a/libnmap/process.py b/libnmap/process.py
@@ -259,6 +259,7 @@ def run(self):
             self.__nmap_proc = subprocess.Popen(args=_tmp_cmdline,
                                                 stdout=subprocess.PIPE,
                                                 stderr=subprocess.PIPE,
+                                                universal_newlines=True,
                                                 bufsize=0)
             self.__state = self.RUNNING
         except OSError:
@@ -268,12 +269,12 @@ def run(self):
 
         while self.__nmap_proc.poll() is None:
             for streamline in iter(self.__nmap_proc.stdout.readline, ''):
-                self.__stdout += str(streamline)
+                self.__stdout += streamline
                 evnt = self.__process_event(streamline)
                 if self.__nmap_event_callback and evnt:
                     self.__nmap_event_callback(self)
 
-        self.__stderr += str(self.__nmap_proc.stderr.read().decode())
+        self.__stderr += self.__nmap_proc.stderr.read()
 
         self.__nmap_rc = self.__nmap_proc.poll()
         if self.rc is None:
