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