summaryrefslogtreecommitdiff
path: root/scripts/Expect.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-04-28 19:27:04 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-04-28 19:27:04 +0200
commite6e102cc642e78cf9da55645c82f5bfe6eacb76d (patch)
treeab5861ee9ad2a909fa0dc8f25b1b12e0dd1d6527 /scripts/Expect.py
parentFixed ICE-6443 and other SSL fixes (diff)
downloadice-e6e102cc642e78cf9da55645c82f5bfe6eacb76d.tar.bz2
ice-e6e102cc642e78cf9da55645c82f5bfe6eacb76d.tar.xz
ice-e6e102cc642e78cf9da55645c82f5bfe6eacb76d.zip
Fixed previous commit which was incomplete
Diffstat (limited to 'scripts/Expect.py')
-rwxr-xr-xscripts/Expect.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/Expect.py b/scripts/Expect.py
index cc92aff163e..c367b5b63a9 100755
--- a/scripts/Expect.py
+++ b/scripts/Expect.py
@@ -18,6 +18,7 @@ import sys
import threading
import time
import traceback
+import types
__all__ = ["Expect", "EOF", "TIMEOUT" ]
@@ -133,7 +134,9 @@ class reader(threading.Thread):
content = self._tbuf.getvalue()
suppress = False
for p in self._tracesuppress:
- if p.search(content):
+ if isinstance(p, types.LambdaType) or isinstance(p, types.FunctionType):
+ content = p(content)
+ elif p.search(content):
suppress = True
break
if not suppress: