*** empty log message ***
This commit is contained in:
parent
22fd93e50f
commit
648d5e1121
|
|
@ -179,6 +179,8 @@ class FFIExternalObject:
|
|||
lineStream = LineStream.LineStream()
|
||||
self.output(lineStream)
|
||||
baseRepr = lineStream.getLine()
|
||||
except AssertionError, e:
|
||||
raise AssertionError, e
|
||||
except:
|
||||
baseRepr = ('[' + self.__class__.__name__ + ' at: ' + `self.this` + ']')
|
||||
# In any case, return the baseRepr
|
||||
|
|
@ -199,18 +201,24 @@ class FFIExternalObject:
|
|||
self.write(lineStream)
|
||||
while lineStream.isTextAvailable():
|
||||
baseRepr = baseRepr + '\n' + lineStream.getLine()
|
||||
except AssertionError, e:
|
||||
raise AssertionError, e
|
||||
except:
|
||||
try:
|
||||
# Sometimes write insists on a seconds parameter.
|
||||
self.write(lineStream, 0)
|
||||
while lineStream.isTextAvailable():
|
||||
baseRepr = baseRepr + '\n' + lineStream.getLine()
|
||||
except AssertionError, e:
|
||||
raise AssertionError, e
|
||||
except:
|
||||
try:
|
||||
# Ok, no write function, lets try output then
|
||||
self.output(lineStream)
|
||||
while lineStream.isTextAvailable():
|
||||
baseRepr = baseRepr + '\n' + lineStream.getLine()
|
||||
except AssertionError, e:
|
||||
raise AssertionError, e
|
||||
except:
|
||||
pass
|
||||
# In any case, return the baseRepr
|
||||
|
|
|
|||
Loading…
Reference in New Issue