From: Marcel Raad Date: Sun, 13 Oct 2019 19:35:56 +0000 (+0200) Subject: smbserver: fix Python 3 compatibility X-Git-Tag: curl-7_67_0~41 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee63837;p=thirdparty%2Fcurl.git smbserver: fix Python 3 compatibility Python 2's `ConfigParser` module is spelled `configparser` in Python 3. Closes https://github.com/curl/curl/pull/4484 --- diff --git a/tests/smbserver.py b/tests/smbserver.py index 474e0612bf..4fcd34f2b8 100755 --- a/tests/smbserver.py +++ b/tests/smbserver.py @@ -24,11 +24,14 @@ from __future__ import (absolute_import, division, print_function) # unicode_literals) import argparse -import ConfigParser import os import sys import logging import tempfile +try: # Python 3 + import configparser +except ImportError: # Python 2 + import ConfigParser as configparser # Import our curl test data helper import curl_test_data @@ -58,7 +61,7 @@ def smbserver(options): f.write("{0}".format(pid)) # Here we write a mini config for the server - smb_config = ConfigParser.ConfigParser() + smb_config = configparser.ConfigParser() smb_config.add_section("global") smb_config.set("global", "server_name", "SERVICE") smb_config.set("global", "server_os", "UNIX")