diff -r 8e116b8ddbc3 -r 5d79dc4e50a3 src/cm/converters/abi_converters.py --- a/src/cm/converters/abi_converters.py Mon Oct 21 16:50:41 2013 +0200 +++ b/src/cm/converters/abi_converters.py Tue Oct 22 15:00:56 2013 +0200 @@ -102,7 +102,11 @@ type or os.path.splitext(out_file)[1][1:], 'txt') # do the conversion - self._perform_conversion(in_file, out_file, type) + try: + self._perform_conversion(in_file, out_file, type) + except: + raise + # return a byte string if no out_file is specified if return_bytes: @@ -126,9 +130,14 @@ self.child.sendline(cmd) # Check for errors - i = self.child.expect(['OK', pexpect.TIMEOUT]) - if i != 0: + i = 1 + + try: + i = self.child.expect(['OK', pexpect.TIMEOUT]) + if i != 0: raise AbiCommandError('Error performing AbiCommand: %s' %cmd) + except: + raise def convert_to_html(self, input): """ @@ -174,7 +183,10 @@ os.chmod(outdir_name, 0777) # read / write # Do the job - self.convert_file(infile_name, outfile_name, 'html') + try: + self.convert_file(infile_name, outfile_name, 'html') + except: + raise out_f = open(outfile_name,'r') output = out_f.read() @@ -191,6 +203,9 @@ output = re.sub(r'