aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2019-10-13 21:35:56 +0200
committerMarcel Raad <Marcel.Raad@teamviewer.com>2019-10-13 22:14:04 +0200
commitee638377328527126ffbe71d1165e12c66830124 (patch)
tree33902c417b4baa13df1bcc1f6aef64694353340e
parenta626fa128cff4a3ac7dd4097328a6d38e659c025 (diff)
smbserver: fix Python 3 compatibility
Python 2's `ConfigParser` module is spelled `configparser` in Python 3. Closes https://github.com/curl/curl/pull/4484
-rwxr-xr-xtests/smbserver.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/smbserver.py b/tests/smbserver.py
index 474e0612b..4fcd34f2b 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")