Blame SOURCES/python-2-to-3.patch

ecbd30
diff -ruN curl-7.61.0.orig/tests/python_dependencies/impacket/nmb.py curl-7.61.0/tests/python_dependencies/impacket/nmb.py
ecbd30
--- curl-7.61.0.orig/tests/python_dependencies/impacket/nmb.py	2018-05-07 04:20:04.000000000 -0400
ecbd30
+++ curl-7.61.0/tests/python_dependencies/impacket/nmb.py	2019-10-01 16:53:00.002827101 -0400
ecbd30
@@ -537,7 +537,7 @@
ecbd30
                             raise NetBIOSError( 'Malformed response')
ecbd30
                         
ecbd30
                         return NBPositiveNameQueryResponse(res.get_answers())
ecbd30
-            except select.error, ex:
ecbd30
+            except select.error as ex:
ecbd30
                 if ex[0] != errno.EINTR and ex[0] != errno.EAGAIN:
ecbd30
                     raise NetBIOSError, ( 'Error occurs while waiting for response', ERRCLASS_OS, ex[0] )
ecbd30
                 raise
ecbd30
@@ -570,7 +570,7 @@
ecbd30
                 else:
ecbd30
                     try:
ecbd30
                         data, _ = self.__sock.recvfrom(65536, 0)
ecbd30
-                    except Exception, e:
ecbd30
+                    except Exception as e:
ecbd30
                         raise NetBIOSError, "recvfrom error: %s" % str(e)
ecbd30
                     self.__sock.close()
ecbd30
                     res = NetBIOSPacket(data)
ecbd30
@@ -584,10 +584,10 @@
ecbd30
                         answ = NBNodeStatusResponse(res.get_answers())
ecbd30
                         self.mac = answ.get_mac()
ecbd30
                         return answ.get_node_names()
ecbd30
-            except select.error, ex:
ecbd30
+            except select.error as ex:
ecbd30
                 if ex[0] != errno.EINTR and ex[0] != errno.EAGAIN:
ecbd30
                     raise NetBIOSError, ( 'Error occurs while waiting for response', ERRCLASS_OS, ex[0] )
ecbd30
-            except socket.error, ex:
ecbd30
+            except socket.error as ex:
ecbd30
                 raise NetBIOSError, 'Connection error: %s' % str(ex)
ecbd30
 
ecbd30
 # Perform first and second level encoding of name as specified in RFC 1001 (Section 4)
ecbd30
@@ -841,7 +841,7 @@
ecbd30
             af, socktype, proto, canonname, sa = socket.getaddrinfo(peer[0], peer[1], 0, socket.SOCK_STREAM)[0]
ecbd30
             sock = socket.socket(af, socktype, proto)
ecbd30
             sock.connect(sa)
ecbd30
-        except socket.error, e:
ecbd30
+        except socket.error as e:
ecbd30
             raise socket.error("Connection error (%s:%s)" % (peer[0], peer[1]), e)
ecbd30
         return sock
ecbd30
 
ecbd30
@@ -900,7 +900,7 @@
ecbd30
 
ecbd30
                 data = data + received
ecbd30
                 bytes_left = read_length - len(data)
ecbd30
-            except select.error, ex:
ecbd30
+            except select.error as ex:
ecbd30
                 if ex[0] != errno.EINTR and ex[0] != errno.EAGAIN:
ecbd30
                     raise NetBIOSError, ( 'Error occurs while reading from remote', ERRCLASS_OS, ex[0] )
ecbd30
 
ecbd30
@@ -923,7 +923,7 @@
ecbd30
 
ecbd30
                 data = data + received
ecbd30
                 bytes_left = read_length - len(data)
ecbd30
-            except select.error, ex:
ecbd30
+            except select.error as ex:
ecbd30
                 if ex[0] != errno.EINTR and ex[0] != errno.EAGAIN:
ecbd30
                     raise NetBIOSError, ( 'Error occurs while reading from remote', ERRCLASS_OS, ex[0] )
ecbd30
 
ecbd30
diff -ruN curl-7.61.0.orig/tests/python_dependencies/impacket/smb3.py curl-7.61.0/tests/python_dependencies/impacket/smb3.py
ecbd30
--- curl-7.61.0.orig/tests/python_dependencies/impacket/smb3.py	2018-05-07 04:20:04.000000000 -0400
ecbd30
+++ curl-7.61.0/tests/python_dependencies/impacket/smb3.py	2019-10-01 16:53:13.613791479 -0400
ecbd30
@@ -539,7 +539,7 @@
ecbd30
 #            else:
ecbd30
 #                ccache.fromTGS(TGS['KDC_REP'], TGS['oldSessionKey'], TGS['sessionKey'] )
ecbd30
 #            ccache.saveFile('/tmp/ticket.bin')
ecbd30
-#        except Exception, e:
ecbd30
+#        except Exception as e:
ecbd30
 #            print e
ecbd30
 #            pass
ecbd30
 
ecbd30
@@ -1385,7 +1385,7 @@
ecbd30
                         files.append(smb.SharedFile(fileInfo['CreationTime'],fileInfo['LastAccessTime'],fileInfo['LastChangeTime'],fileInfo['EndOfFile'],fileInfo['AllocationSize'],fileInfo['ExtFileAttributes'],fileInfo['FileName'].decode('utf-16le'), fileInfo['FileName'].decode('utf-16le')))
ecbd30
                         nextOffset = fileInfo['NextEntryOffset']
ecbd30
                         res = res[nextOffset:]
ecbd30
-                except SessionError, e:
ecbd30
+                except SessionError as e:
ecbd30
                     if (e.get_error_code()) != STATUS_NO_MORE_FILES:
ecbd30
                         raise
ecbd30
                     break 
ecbd30
diff -ruN curl-7.61.0.orig/tests/python_dependencies/impacket/smbserver.py curl-7.61.0/tests/python_dependencies/impacket/smbserver.py
ecbd30
--- curl-7.61.0.orig/tests/python_dependencies/impacket/smbserver.py	2018-05-07 04:20:04.000000000 -0400
ecbd30
+++ curl-7.61.0/tests/python_dependencies/impacket/smbserver.py	2019-10-01 16:54:33.682581946 -0400
ecbd30
@@ -80,7 +80,7 @@
ecbd30
             else:
ecbd30
                 # NTLMv1
ecbd30
                 ret_value = {'hash_string':'%s::%s:%s:%s:%s' % (username, domain, hexlify(lmresponse), hexlify(ntresponse), hexlify(challenge)), 'hash_version':'ntlm'}
ecbd30
-        except Exception, e:
ecbd30
+        except Exception as e:
ecbd30
             LOG.error("outputToJohnFormat: %s" % e)
ecbd30
             pass
ecbd30
 
ecbd30
@@ -183,7 +183,7 @@
ecbd30
         if sys.platform == 'win32':
ecbd30
             mode |= os.O_BINARY
ecbd30
         fid = os.open(pathName, mode)
ecbd30
-    except Exception, e:
ecbd30
+    except Exception as e:
ecbd30
         LOG.error("openFile: %s,%s" % (pathName, mode) ,e)
ecbd30
         fid = 0
ecbd30
         errorCode = STATUS_ACCESS_DENIED
ecbd30
@@ -442,7 +442,7 @@
ecbd30
     else:
ecbd30
         # NOT FOUND
ecbd30
         return None, STATUS_OBJECT_NAME_NOT_FOUND
ecbd30
-  except Exception, e:
ecbd30
+  except Exception as e:
ecbd30
       LOG.error('queryPathInfo: %s' % e)
ecbd30
       raise
ecbd30
 
ecbd30
@@ -708,7 +708,7 @@
ecbd30
             path = connData['ConnectedShares'][recvPacket['Tid']]['path']
ecbd30
             try:
ecbd30
                infoRecord, errorCode = queryPathInformation(path, decodeSMBString(recvPacket['Flags2'], queryPathInfoParameters['FileName']), queryPathInfoParameters['InformationLevel'])
ecbd30
-            except Exception, e:
ecbd30
+            except Exception as e:
ecbd30
                smbServer.log("queryPathInformation: %s" % e,logging.ERROR)
ecbd30
 
ecbd30
             if infoRecord is not None:
ecbd30
@@ -893,7 +893,7 @@
ecbd30
                                 transData['Trans_Parameters'],
ecbd30
                                 transData['Trans_Data'],
ecbd30
                                 transParameters['MaxDataCount'])
ecbd30
-               except Exception, e:
ecbd30
+               except Exception as e:
ecbd30
                    #print 'Transaction: %s' % e,e
ecbd30
                    smbServer.log('Transaction: (%r,%s)' % (command, e), logging.ERROR)
ecbd30
                    errorCode = STATUS_ACCESS_DENIED
ecbd30
@@ -1030,7 +1030,7 @@
ecbd30
                                 NTTransData['NT_Trans_Parameters'],
ecbd30
                                 NTTransData['NT_Trans_Data'],
ecbd30
                                 NTTransParameters['MaxDataCount'])
ecbd30
-               except Exception, e:
ecbd30
+               except Exception as e:
ecbd30
                    smbServer.log('NTTransaction: (0x%x,%s)' % (command, e), logging.ERROR)
ecbd30
                    errorCode = STATUS_ACCESS_DENIED
ecbd30
                    #raise
ecbd30
@@ -1166,7 +1166,7 @@
ecbd30
                                 trans2Data['Trans_Parameters'],
ecbd30
                                 trans2Data['Trans_Data'],
ecbd30
                                 trans2Parameters['MaxDataCount'])
ecbd30
-               except Exception, e:
ecbd30
+               except Exception as e:
ecbd30
                    smbServer.log('Transaction2: (0x%x,%s)' % (command, e), logging.ERROR)
ecbd30
                    #import traceback
ecbd30
                    #traceback.print_exc()
ecbd30
@@ -1290,7 +1290,7 @@
ecbd30
                      connData['OpenedFiles'][comClose['FID']]['Socket'].close()
ecbd30
                  elif fileHandle != VOID_FILE_DESCRIPTOR:
ecbd30
                      os.close(fileHandle)
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log("comClose %s" % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
              else:
ecbd30
@@ -1298,7 +1298,7 @@
ecbd30
                  if connData['OpenedFiles'][comClose['FID']]['DeleteOnClose'] is True:
ecbd30
                      try:
ecbd30
                          os.remove(connData['OpenedFiles'][comClose['FID']]['FileName'])
ecbd30
-                     except Exception, e:
ecbd30
+                     except Exception as e:
ecbd30
                          smbServer.log("comClose %s" % e, logging.ERROR)
ecbd30
                          errorCode = STATUS_ACCESS_DENIED
ecbd30
                  del(connData['OpenedFiles'][comClose['FID']])
ecbd30
@@ -1340,7 +1340,7 @@
ecbd30
                      sock = connData['OpenedFiles'][comWriteParameters['Fid']]['Socket']
ecbd30
                      sock.send(comWriteData['Data'])
ecbd30
                  respParameters['Count']    = comWriteParameters['Count']
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log('smbComWrite: %s' % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -1372,7 +1372,7 @@
ecbd30
              fileHandle = connData['OpenedFiles'][comFlush['FID']]['FileHandle']
ecbd30
              try:
ecbd30
                  os.fsync(fileHandle)
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log("comFlush %s" % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -1417,7 +1417,7 @@
ecbd30
              else:
ecbd30
                  try:
ecbd30
                      os.mkdir(pathName)
ecbd30
-                 except Exception, e:
ecbd30
+                 except Exception as e:
ecbd30
                      smbServer.log("smbComCreateDirectory: %s" % e, logging.ERROR)
ecbd30
                      errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -1466,7 +1466,7 @@
ecbd30
              else:
ecbd30
                  try:
ecbd30
                      os.rename(oldPathName,newPathName)
ecbd30
-                 except OSError, e:
ecbd30
+                 except OSError as e:
ecbd30
                      smbServer.log("smbComRename: %s" % e, logging.ERROR)
ecbd30
                      errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -1510,7 +1510,7 @@
ecbd30
              else:
ecbd30
                  try:
ecbd30
                      os.remove(pathName)
ecbd30
-                 except OSError, e:
ecbd30
+                 except OSError as e:
ecbd30
                      smbServer.log("smbComDelete: %s" % e, logging.ERROR)
ecbd30
                      errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -1554,7 +1554,7 @@
ecbd30
              else:
ecbd30
                  try:
ecbd30
                      os.rmdir(pathName)
ecbd30
-                 except OSError, e:
ecbd30
+                 except OSError as e:
ecbd30
                      smbServer.log("smbComDeleteDirectory: %s" % e,logging.ERROR)
ecbd30
                      if e.errno == errno.ENOTEMPTY:
ecbd30
                          errorCode = STATUS_DIRECTORY_NOT_EMPTY
ecbd30
@@ -1611,7 +1611,7 @@
ecbd30
 
ecbd30
                  respParameters['Count']    = writeAndX['DataLength']
ecbd30
                  respParameters['Available']= 0xff
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log('smbComWriteAndx: %s' % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -1651,7 +1651,7 @@
ecbd30
                  respParameters['Count']    = len(content)
ecbd30
                  respData['DataLength']     = len(content)
ecbd30
                  respData['Data']           = content
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log('smbComRead: %s ' % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -1698,7 +1698,7 @@
ecbd30
                  respParameters['DataOffset']   = 59
ecbd30
                  respParameters['DataCount_Hi'] = 0
ecbd30
                  respData = content
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log('smbComReadAndX: %s ' % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -1873,7 +1873,7 @@
ecbd30
                  if os.path.isfile(pathName):
ecbd30
                      attribs = smb.SMB_FILE_ATTRIBUTE_NORMAL
ecbd30
                  respParameters['FileAttributes'] = attribs
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log('smbComQueryInformation2 %s' % e,logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
 
ecbd30
@@ -1969,7 +1969,7 @@
ecbd30
                              # Let's create the directory
ecbd30
                              os.mkdir(pathName)
ecbd30
                              mode = os.O_RDONLY
ecbd30
-                         except Exception, e:
ecbd30
+                         except Exception as e:
ecbd30
                              smbServer.log("NTCreateAndX: %s,%s,%s" % (pathName,mode,e),logging.ERROR)
ecbd30
                              errorCode = STATUS_ACCESS_DENIED
ecbd30
                  if createOptions & smb.FILE_NON_DIRECTORY_FILE == smb.FILE_NON_DIRECTORY_FILE:
ecbd30
@@ -1995,7 +1995,7 @@
ecbd30
                                 sock.connect(smbServer.getRegisteredNamedPipes()[unicode(pathName)])
ecbd30
                             else:
ecbd30
                                 fid = os.open(pathName, mode)
ecbd30
-                     except Exception, e:
ecbd30
+                     except Exception as e:
ecbd30
                          smbServer.log("NTCreateAndX: %s,%s,%s" % (pathName,mode,e),logging.ERROR)
ecbd30
                          #print e
ecbd30
                          fid = 0
ecbd30
@@ -2463,7 +2463,7 @@
ecbd30
            connData['_dialects_data']       = _dialects_data
ecbd30
            connData['_dialects_parameters'] = _dialects_parameters
ecbd30
 
ecbd30
-        except Exception, e:
ecbd30
+        except Exception as e:
ecbd30
            # No NTLM throw an error
ecbd30
            smbServer.log('smbComNegotiate: %s' % e, logging.ERROR)
ecbd30
            respSMBCommand['Data'] = struct.pack('
ecbd30
@@ -2842,7 +2842,7 @@
ecbd30
                              # Let's create the directory
ecbd30
                              os.mkdir(pathName)
ecbd30
                              mode = os.O_RDONLY
ecbd30
-                         except Exception, e:
ecbd30
+                         except Exception as e:
ecbd30
                              smbServer.log("SMB2_CREATE: %s,%s,%s" % (pathName,mode,e),logging.ERROR)
ecbd30
                              errorCode = STATUS_ACCESS_DENIED
ecbd30
                  if createOptions & smb2.FILE_NON_DIRECTORY_FILE == smb2.FILE_NON_DIRECTORY_FILE:
ecbd30
@@ -2868,7 +2868,7 @@
ecbd30
                                 sock.connect(smbServer.getRegisteredNamedPipes()[unicode(pathName)])
ecbd30
                             else:
ecbd30
                                 fid = os.open(pathName, mode)
ecbd30
-                     except Exception, e:
ecbd30
+                     except Exception as e:
ecbd30
                          smbServer.log("SMB2_CREATE: %s,%s,%s" % (pathName,mode,e),logging.ERROR)
ecbd30
                          #print e
ecbd30
                          fid = 0
ecbd30
@@ -2957,7 +2957,7 @@
ecbd30
                  elif fileHandle != VOID_FILE_DESCRIPTOR:
ecbd30
                      os.close(fileHandle)
ecbd30
                      infoRecord, errorCode = queryFileInformation(os.path.dirname(pathName), os.path.basename(pathName), smb2.SMB2_FILE_NETWORK_OPEN_INFO)
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log("SMB2_CLOSE %s" % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_INVALID_HANDLE
ecbd30
              else:
ecbd30
@@ -2968,7 +2968,7 @@
ecbd30
                              shutil.rmtree(connData['OpenedFiles'][fileID]['FileName'])
ecbd30
                          else:
ecbd30
                              os.remove(connData['OpenedFiles'][fileID]['FileName'])
ecbd30
-                     except Exception, e:
ecbd30
+                     except Exception as e:
ecbd30
                          smbServer.log("SMB2_CLOSE %s" % e, logging.ERROR)
ecbd30
                          errorCode = STATUS_ACCESS_DENIED
ecbd30
 
ecbd30
@@ -3104,7 +3104,7 @@
ecbd30
                         try:
ecbd30
                              os.rename(pathName,newPathName)
ecbd30
                              connData['OpenedFiles'][fileID]['FileName'] = newPathName
ecbd30
-                        except Exception, e:
ecbd30
+                        except Exception as e:
ecbd30
                              smbServer.log("smb2SetInfo: %s" % e, logging.ERROR)
ecbd30
                              errorCode = STATUS_ACCESS_DENIED
ecbd30
                     else:
ecbd30
@@ -3168,7 +3168,7 @@
ecbd30
 
ecbd30
                  respSMBCommand['Count']    = writeRequest['Length']
ecbd30
                  respSMBCommand['Remaining']= 0xff
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log('SMB2_WRITE: %s' % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -3211,7 +3211,7 @@
ecbd30
                  respSMBCommand['DataLength']   = len(content)
ecbd30
                  respSMBCommand['DataRemaining']= 0
ecbd30
                  respSMBCommand['Buffer']       = content
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log('SMB2_READ: %s ' % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -3232,7 +3232,7 @@
ecbd30
              errorCode = STATUS_SUCCESS
ecbd30
              try:
ecbd30
                  os.fsync(fileHandle)
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log("SMB2_FLUSH %s" % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -3485,7 +3485,7 @@
ecbd30
                      sock = connData['OpenedFiles'][str(ioctlRequest['FileID'])]['Socket']
ecbd30
                      sock.sendall(ioctlRequest['Buffer'])
ecbd30
                      ioctlResponse = sock.recv(ioctlRequest['MaxOutputResponse'])
ecbd30
-             except Exception, e:
ecbd30
+             except Exception as e:
ecbd30
                  smbServer.log('fsctlPipeTransceive: %s ' % e, logging.ERROR)
ecbd30
                  errorCode = STATUS_ACCESS_DENIED
ecbd30
         else:
ecbd30
@@ -3551,7 +3551,7 @@
ecbd30
                    # a single packet
ecbd30
                    for i in resp:
ecbd30
                        session.send_packet(str(i))
ecbd30
-            except Exception, e:
ecbd30
+            except Exception as e:
ecbd30
                 self.__SMB.log("Handle: %s" % e)
ecbd30
                 #import traceback
ecbd30
                 #traceback.print_exc()
ecbd30
@@ -3975,7 +3975,7 @@
ecbd30
                                try:
ecbd30
                                    respCommands, respPackets, errorCode = self.__smb2Commands[smb2.SMB2_NEGOTIATE](connId, self, packet, True)
ecbd30
                                    isSMB2 = True
ecbd30
-                               except Exception, e:
ecbd30
+                               except Exception as e:
ecbd30
                                    self.log('SMB2_NEGOTIATE: %s' % e, logging.ERROR)
ecbd30
                                    # If something went wrong, let's fallback to SMB1
ecbd30
                                    respCommands, respPackets, errorCode = self.__smbCommands[packet['Command']](
ecbd30
@@ -4025,7 +4025,7 @@
ecbd30
                     else:
ecbd30
                         done = True
ecbd30
 
ecbd30
-        except Exception, e:
ecbd30
+        except Exception as e:
ecbd30
             #import traceback
ecbd30
             #traceback.print_exc()
ecbd30
             # Something wen't wrong, defaulting to Bad user ID
ecbd30
diff -ruN curl-7.61.0.orig/tests/python_dependencies/impacket/structure.py curl-7.61.0/tests/python_dependencies/impacket/structure.py
ecbd30
--- curl-7.61.0.orig/tests/python_dependencies/impacket/structure.py	2018-05-07 04:20:04.000000000 -0400
ecbd30
+++ curl-7.61.0/tests/python_dependencies/impacket/structure.py	2019-10-01 16:53:30.175748139 -0400
ecbd30
@@ -119,7 +119,7 @@
ecbd30
         for field in self.commonHdr+self.structure:
ecbd30
             try:
ecbd30
                 data += self.packField(field[0], field[1])
ecbd30
-            except Exception, e:
ecbd30
+            except Exception as e:
ecbd30
                 if self.fields.has_key(field[0]):
ecbd30
                     e.args += ("When packing field '%s | %s | %r' in %s" % (field[0], field[1], self[field[0]], self.__class__),)
ecbd30
                 else:
ecbd30
@@ -145,7 +145,7 @@
ecbd30
                 dataClassOrCode = field[2]
ecbd30
             try:
ecbd30
                 self[field[0]] = self.unpack(field[1], data[:size], dataClassOrCode = dataClassOrCode, field = field[0])
ecbd30
-            except Exception,e:
ecbd30
+            except Exception as e:
ecbd30
                 e.args += ("When unpacking field '%s | %s | %r[:%d]'" % (field[0], field[1], data, size),)
ecbd30
                 raise
ecbd30