smbserver: fix Python version specific ConfigParser import

Follow up to ee63837 and 8c7c4a6
Fixes #5077

diff --git a/tests/python_dependencies/impacket/smbserver.py b/tests/python_dependencies/impacket/smbserver.py
index c481b27baadce9ec4b3f633493d363bd7976f56f..902d22f9c0b6380629db32580edc35a3e0b2e8a6 100644 (file)
--- a/tests/python_dependencies/impacket/smbserver.py
+++ b/tests/python_dependencies/impacket/smbserver.py
@@ -26,9 +26,10 @@ import socket
 import time
 import datetime
 import struct
-try: # Python 3
+import sys
+if sys.version_info.major >= 3:
     import configparser
-except ImportError: # Python 2
+else:
     import ConfigParser as configparser
 import SocketServer
 import threading
@@ -38,7 +39,6 @@ import ntpath
 import os
 import fnmatch
 import errno
-import sys
 import random
 import shutil
 from binascii import hexlify

diff --git a/tests/smbserver.py b/tests/smbserver.py
index 4fcd34f2b8ecab5b71089439df35b59ecef8e42a..fbebe1015d15c2240e7146abbad6b23e5d50060e 100755 (executable)
--- a/tests/smbserver.py
+++ b/tests/smbserver.py
@@ -28,9 +28,9 @@ import os
 import sys
 import logging
 import tempfile
-try: # Python 3
+if sys.version_info.major >= 3:
     import configparser
-except ImportError: # Python 2
+else:
     import ConfigParser as configparser
 
 # Import our curl test data helper