diff --git a/servers/Browser.py b/servers/Browser.py
index 782eaf6..abda10c 100644
--- a/servers/Browser.py
+++ b/servers/Browser.py
@@ -16,7 +16,7 @@
# along with this program. If not, see .
from utils import *
from packets import SMBHeader, SMBNegoData, SMBSessionData, SMBTreeConnectData, RAPNetServerEnum3Data, SMBTransRAPData
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler
else:
from SocketServer import BaseRequestHandler
diff --git a/servers/DNS.py b/servers/DNS.py
index c9de9c0..294b146 100644
--- a/servers/DNS.py
+++ b/servers/DNS.py
@@ -16,7 +16,7 @@
# along with this program. If not, see .
from utils import *
from packets import DNS_Ans
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler
else:
from SocketServer import BaseRequestHandler
diff --git a/servers/FTP.py b/servers/FTP.py
index 22b8f09..cd249ac 100644
--- a/servers/FTP.py
+++ b/servers/FTP.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
from utils import *
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler
else:
from SocketServer import BaseRequestHandler
diff --git a/servers/HTTP.py b/servers/HTTP.py
index 7f18452..06c92eb 100644
--- a/servers/HTTP.py
+++ b/servers/HTTP.py
@@ -17,7 +17,7 @@
import struct
import codecs
from utils import *
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler, StreamRequestHandler
else:
from SocketServer import BaseRequestHandler, StreamRequestHandler
diff --git a/servers/HTTP_Proxy.py b/servers/HTTP_Proxy.py
index 76402c1..2b23dbf 100644
--- a/servers/HTTP_Proxy.py
+++ b/servers/HTTP_Proxy.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
from utils import *
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
import urllib.parse as urlparse
import http.server as BaseHTTPServer
else:
diff --git a/servers/Kerberos.py b/servers/Kerberos.py
index bef73ce..4605365 100644
--- a/servers/Kerberos.py
+++ b/servers/Kerberos.py
@@ -17,7 +17,7 @@
import codecs
import struct
from utils import *
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler
else:
from SocketServer import BaseRequestHandler
diff --git a/servers/MSSQL.py b/servers/MSSQL.py
index e255f00..3a44012 100644
--- a/servers/MSSQL.py
+++ b/servers/MSSQL.py
@@ -18,7 +18,7 @@ import random
import struct
import codecs
from utils import *
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler
else:
from SocketServer import BaseRequestHandler
diff --git a/servers/POP3.py b/servers/POP3.py
index 1691096..59d060c 100644
--- a/servers/POP3.py
+++ b/servers/POP3.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
from utils import *
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler
else:
from SocketServer import BaseRequestHandler
diff --git a/servers/Proxy_Auth.py b/servers/Proxy_Auth.py
index 9351785..ad17546 100644
--- a/servers/Proxy_Auth.py
+++ b/servers/Proxy_Auth.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
from utils import *
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler, StreamRequestHandler
else:
from SocketServer import BaseRequestHandler, StreamRequestHandler
diff --git a/servers/RDP.py b/servers/RDP.py
index fd52f1d..82edbe7 100644
--- a/servers/RDP.py
+++ b/servers/RDP.py
@@ -19,7 +19,7 @@ import struct
import re
import ssl
import codecs
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler
else:
from SocketServer import BaseRequestHandler
diff --git a/servers/SMB.py b/servers/SMB.py
index 35837ab..c61dcf5 100644
--- a/servers/SMB.py
+++ b/servers/SMB.py
@@ -17,7 +17,7 @@
import struct, re
import codecs
from utils import *
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler
else:
from SocketServer import BaseRequestHandler
diff --git a/servers/SMTP.py b/servers/SMTP.py
index 3a8ca77..0dc5bd0 100644
--- a/servers/SMTP.py
+++ b/servers/SMTP.py
@@ -16,7 +16,7 @@
# along with this program. If not, see .
from utils import *
from base64 import b64decode
-if settings.Config.PY2OR3 is "PY3":
+if settings.Config.PY2OR3 == "PY3":
from socketserver import BaseRequestHandler
else:
from SocketServer import BaseRequestHandler
diff --git a/utils.py b/utils.py
index d2a8e24..3b88412 100644
--- a/utils.py
+++ b/utils.py
@@ -26,7 +26,7 @@ import codecs
import struct
def RandomChallenge():
- if settings.Config.PY2OR3 is "PY3":
+ if settings.Config.PY2OR3 == "PY3":
if settings.Config.NumChal == "random":
from random import getrandbits
NumChal = b'%016x' % getrandbits(16 * 4)
@@ -107,7 +107,7 @@ def RespondToThisHost(ClientIp, Name):
return RespondToThisIP(ClientIp) and RespondToThisName(Name)
def RespondWithIPAton():
- if settings.Config.PY2OR3 is "PY2":
+ if settings.Config.PY2OR3 == "PY2":
if settings.Config.ExternalIP:
return settings.Config.ExternalIPAton
else:
@@ -167,7 +167,7 @@ def DumpConfig(outfile, data):
def StructPython2or3(endian,data):
#Python2...
- if settings.Config.PY2OR3 is "PY2":
+ if settings.Config.PY2OR3 == "PY2":
return struct.pack(endian, len(data))
#Python3...
else:
@@ -175,20 +175,20 @@ def StructPython2or3(endian,data):
def StructWithLenPython2or3(endian,data):
#Python2...
- if settings.Config.PY2OR3 is "PY2":
+ if settings.Config.PY2OR3 == "PY2":
return struct.pack(endian, data)
#Python3...
else:
return struct.pack(endian, data).decode('latin-1')
def NetworkSendBufferPython2or3(data):
- if settings.Config.PY2OR3 is "PY2":
+ if settings.Config.PY2OR3 == "PY2":
return str(data)
else:
return bytes(str(data), 'latin-1')
def NetworkRecvBufferPython2or3(data):
- if settings.Config.PY2OR3 is "PY2":
+ if settings.Config.PY2OR3 == "PY2":
return str(data)
else:
return str(data.decode('latin-1'))