luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smbserver: fix Python version specific ConfigParser import

Browse Source 
Follow up to ee63837 and 8c7c4a6
Fixes #5077
This commit is contained in:
Marc Hoersken 2020-03-12 09:15:36 +01:00
parent 4674269633
commit d5c01d779f
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/python_dependencies/impacket/smbserver.py
View File

@ -26,9 +26,10 @@ import socket
import time import time
import datetime import datetime
import struct import struct
try: # Python 3 import sys
if sys.version_info.major >= 3:
import configparser import configparser
except ImportError: # Python 2 else:
import ConfigParser as configparser import ConfigParser as configparser
import SocketServer import SocketServer
import threading import threading
@ -38,7 +39,6 @@ import ntpath
import os import os
import fnmatch import fnmatch
import errno import errno
import sys
import random import random
import shutil import shutil
from binascii import hexlify from binascii import hexlify

4
tests/smbserver.py
View File

@ -28,9 +28,9 @@ import os
import sys import sys
import logging import logging
import tempfile import tempfile
try: # Python 3 if sys.version_info.major >= 3:
import configparser import configparser
except ImportError: # Python 2 else:
import ConfigParser as configparser import ConfigParser as configparser
# Import our curl test data helper # Import our curl test data helper