merging master

2014-08-13 17:35:34 -07:00
parent 41a54f05cb 161e7997fa
commit 417d79780f
4 changed files with 35 additions and 55 deletions
@@ -261,6 +261,7 @@ class Node( object ):
        # Look for PID
        marker = chr( 1 ) + r'\d+\r\n'
        if findPid and chr( 1 ) in data:
+            # Marker can be read in chunks; continue until all of it is read
            while not re.findall( marker, data ):
                data += self.read( 1024 )
            markers = re.findall( marker, data )