[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 10/264: impacket: some more Python 3 code compatibility updates
From: |
gnunet |
Subject: |
[gnurl] 10/264: impacket: some more Python 3 code compatibility updates |
Date: |
Thu, 30 Apr 2020 16:05:13 +0200 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit a7e24c736267d0cbf9ab2eedf2027b7d26e317bb
Author: Marc Hoersken <address@hidden>
AuthorDate: Thu Mar 12 09:26:56 2020 +0100
impacket: some more Python 3 code compatibility updates
This makes smbserver load on Python 3, but still not work completely.
---
tests/python_dependencies/impacket/smb.py | 12 ++++++++----
tests/python_dependencies/impacket/smbserver.py | 17 +++++++++--------
tests/python_dependencies/impacket/spnego.py | 2 +-
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/tests/python_dependencies/impacket/smb.py
b/tests/python_dependencies/impacket/smb.py
index c4ea6fc68..fa3a3d4fe 100644
--- a/tests/python_dependencies/impacket/smb.py
+++ b/tests/python_dependencies/impacket/smb.py
@@ -57,10 +57,14 @@ import hashlib
unicode_support = 0
unicode_convert = 1
-try:
- from cStringIO import StringIO
-except ImportError:
- from StringIO import StringIO
+import sys
+if sys.version_info.major >= 3:
+ from io import StringIO
+else:
+ try:
+ from cStringIO import StringIO
+ except ImportError:
+ from StringIO import StringIO
# Dialect for SMB1
SMB_DIALECT = 'NT LM 0.12'
diff --git a/tests/python_dependencies/impacket/smbserver.py
b/tests/python_dependencies/impacket/smbserver.py
index 902d22f9c..a74bd9414 100644
--- a/tests/python_dependencies/impacket/smbserver.py
+++ b/tests/python_dependencies/impacket/smbserver.py
@@ -29,9 +29,10 @@ import struct
import sys
if sys.version_info.major >= 3:
import configparser
+ import socketserver
else:
import ConfigParser as configparser
-import SocketServer
+ import SocketServer as socketserver
import threading
import logging
import logging.config
@@ -3519,7 +3520,7 @@ class Ioctls:
return validateNegotiateInfo.getData(), errorCode
-class SMBSERVERHandler(SocketServer.BaseRequestHandler):
+class SMBSERVERHandler(socketserver.BaseRequestHandler):
def __init__(self, request, client_address, server, select_poll = False):
self.__SMB = server
self.__ip, self.__port = client_address
@@ -3528,7 +3529,7 @@ class SMBSERVERHandler(SocketServer.BaseRequestHandler):
self.__timeOut = 60*5
self.__select_poll = select_poll
#self.__connId = os.getpid()
- SocketServer.BaseRequestHandler.__init__(self, request,
client_address, server)
+ socketserver.BaseRequestHandler.__init__(self, request,
client_address, server)
def handle(self):
self.__SMB.log("Incoming connection (%s,%d)" % (self.__ip,
self.__port))
@@ -3570,13 +3571,13 @@ class SMBSERVERHandler(SocketServer.BaseRequestHandler):
# Thread/process is dying, we should tell the main SMB thread to
remove all this thread data
self.__SMB.log("Closing down connection (%s,%d)" % (self.__ip,
self.__port))
self.__SMB.removeConnection(self.__connId)
- return SocketServer.BaseRequestHandler.finish(self)
+ return socketserver.BaseRequestHandler.finish(self)
-class SMBSERVER(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
-#class SMBSERVER(SocketServer.ForkingMixIn, SocketServer.TCPServer):
+class SMBSERVER(socketserver.ThreadingMixIn, socketserver.TCPServer):
+#class SMBSERVER(socketserver.ForkingMixIn, socketserver.TCPServer):
def __init__(self, server_address, handler_class=SMBSERVERHandler,
config_parser = None):
- SocketServer.TCPServer.allow_reuse_address = True
- SocketServer.TCPServer.__init__(self, server_address, handler_class)
+ socketserver.TCPServer.allow_reuse_address = True
+ socketserver.TCPServer.__init__(self, server_address, handler_class)
# Server name and OS to be presented whenever is necessary
self.__serverName = ''
diff --git a/tests/python_dependencies/impacket/spnego.py
b/tests/python_dependencies/impacket/spnego.py
index 98069f579..ceea1c58a 100644
--- a/tests/python_dependencies/impacket/spnego.py
+++ b/tests/python_dependencies/impacket/spnego.py
@@ -31,7 +31,7 @@ MechTypes = {
'*\x86H\x86\xf7\x12\x01\x02\x02': 'KRB5 - Kerberos 5',
'*\x86H\x86\xf7\x12\x01\x02\x02\x03': 'KRB5 - Kerberos 5 - User to User'
}
-TypesMech = dict((v,k) for k, v in MechTypes.iteritems())
+TypesMech = dict((v,k) for k, v in MechTypes.items())
def asn1encode(data = ''):
#res = asn1.SEQUENCE(str).encode()
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] branch master updated (55ddc6582 -> 7179f6d6c), gnunet, 2020/04/30
- [gnurl] 07/264: smbserver: fix Python version specific ConfigParser import, gnunet, 2020/04/30
- [gnurl] 01/264: configure: document 'compiler_num' for gcc, gnunet, 2020/04/30
- [gnurl] 03/264: configure: convert -I to -isystem as a last step, gnunet, 2020/04/30
- [gnurl] 02/264: configure: fix -pedantic-errors for GCC 5 and later, gnunet, 2020/04/30
- [gnurl] 04/264: Makefile: run the cd commands in a subshell, gnunet, 2020/04/30
- [gnurl] 06/264: RELEASE-NOTES: synced, gnunet, 2020/04/30
- [gnurl] 09/264: smbserver: pin Python version to 2 since we are not yet 3 compatible, gnunet, 2020/04/30
- [gnurl] 10/264: impacket: some more Python 3 code compatibility updates,
gnunet <=
- [gnurl] 08/264: cleanup: fix some text/comment typos, gnunet, 2020/04/30
- [gnurl] 05/264: tests/data: Fix some XML formatting issues in test cases, gnunet, 2020/04/30
- [gnurl] 11/264: server/getpart: make the "XML-parser" stricter, gnunet, 2020/04/30
- [gnurl] 13/264: easy: Fix curl_easy_duphandle for builds missing IPv6 that use c-ares, gnunet, 2020/04/30
- [gnurl] 17/264: ci/tests: fix and align setting TFLAGS for make test-nonflaky, gnunet, 2020/04/30
- [gnurl] 14/264: Makefile.m32: Improve windres parameter compatibility, gnunet, 2020/04/30
- [gnurl] 19/264: select: move duplicate select preparation code into Curl_select, gnunet, 2020/04/30
- [gnurl] 24/264: tests/README: add note about manually installing python-impacket, gnunet, 2020/04/30
- [gnurl] 23/264: transfer: cap retries of "dead connections" to 5, gnunet, 2020/04/30
- [gnurl] 25/264: ci/tests: install impacket for SMB tests on FreeBSD using CirrusCI, gnunet, 2020/04/30