[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 171/222: smbserver: fix Python 3 compatibility
From: |
gnunet |
Subject: |
[gnurl] 171/222: smbserver: fix Python 3 compatibility |
Date: |
Thu, 07 Nov 2019 00:11:07 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit ee638377328527126ffbe71d1165e12c66830124
Author: Marcel Raad <address@hidden>
AuthorDate: Sun Oct 13 21:35:56 2019 +0200
smbserver: fix Python 3 compatibility
Python 2's `ConfigParser` module is spelled `configparser` in Python 3.
Closes https://github.com/curl/curl/pull/4484
---
tests/smbserver.py | 7 +++++--
1 file 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")
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 156/222: tests: use port 2 instead of 60000 for a safer non-listening port, (continued)
- [gnurl] 156/222: tests: use port 2 instead of 60000 for a safer non-listening port, gnunet, 2019/11/06
- [gnurl] 158/222: connect: return CURLE_OPERATION_TIMEDOUT for errno == ETIMEDOUT, gnunet, 2019/11/06
- [gnurl] 155/222: KNOWN_BUGS: IDN tests failing on Windows, gnunet, 2019/11/06
- [gnurl] 160/222: socketpair: an implemention for Windows and more, gnunet, 2019/11/06
- [gnurl] 162/222: gskit: use the generic Curl_socketpair, gnunet, 2019/11/06
- [gnurl] 147/222: docs: added multi-event.c example, gnunet, 2019/11/06
- [gnurl] 163/222: socketpair: fix double-close in error case, gnunet, 2019/11/06
- [gnurl] 170/222: security: silence conversion warning, gnunet, 2019/11/06
- [gnurl] 178/222: test1162: disable MSYS2's POSIX path conversion, gnunet, 2019/11/06
- [gnurl] 166/222: KNOWN_BUGS: "LDAP on Windows does authentication wrong", gnunet, 2019/11/06
- [gnurl] 171/222: smbserver: fix Python 3 compatibility,
gnunet <=
- [gnurl] 168/222: TODO: Handle growing SFTP files, gnunet, 2019/11/06
- [gnurl] 189/222: tests: add missing proxy features, gnunet, 2019/11/06
- [gnurl] 177/222: RELEASE-NOTES: synced, gnunet, 2019/11/06
- [gnurl] 181/222: travis: Add an ARM64 build, gnunet, 2019/11/06
- [gnurl] 182/222: http2: expire a timeout at end of stream, gnunet, 2019/11/06
- [gnurl] 187/222: tests: use %FILE_PWD for file:// URLs, gnunet, 2019/11/06
- [gnurl] 192/222: test1591: fix spelling of http feature, gnunet, 2019/11/06
- [gnurl] 193/222: schannel: reverse the order of certinfo insertions, gnunet, 2019/11/06
- [gnurl] 199/222: HTTP3: fix typo somehere1 > somewhere1, gnunet, 2019/11/06
- [gnurl] 188/222: RELEASE-NOTES: synced, gnunet, 2019/11/06