Skip to content

Commit bf8652b

Browse files
authored
2 small fixes related to Pipetools (#4532)
* Fix: make sure ObjectPipe does not overwrite sensible defaut name by Pipe class * Fix: fds are non-inheritable by default since Python 3.4. It broke TermSink
1 parent da9a952 commit bf8652b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

scapy/pipetool.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,8 @@ def stop(self):
357357
class Source(Pipe, ObjectPipe[Any]):
358358
def __init__(self, name=None):
359359
# type: (Optional[str]) -> None
360-
Pipe.__init__(self, name=name)
361360
ObjectPipe.__init__(self, name)
361+
Pipe.__init__(self, name=name)
362362
self.is_exhausted = False
363363

364364
def _read_message(self):
@@ -716,6 +716,7 @@ def _start_unix(self):
716716
if not self.opened:
717717
self.opened = True
718718
rdesc, self.wdesc = os.pipe()
719+
os.set_inheritable(rdesc, True)
719720
cmd = ["xterm"]
720721
if self.name is not None:
721722
cmd.extend(["-title", self.name])

0 commit comments

Comments
 (0)