From 3119c329414cdfb6402927f0d55fc140bff46ccb Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Sat, 17 Feb 2024 15:14:34 +0100 Subject: [PATCH 1/4] remove Python2 comptability code --- configargparse.py | 7 ++----- tests/test_configargparse.py | 6 +----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/configargparse.py b/configargparse.py index 33a2ccf1..ada70d47 100644 --- a/configargparse.py +++ b/configargparse.py @@ -14,12 +14,9 @@ import sys import types from collections import OrderedDict -import textwrap +from io import StringIO -if sys.version_info >= (3, 0): - from io import StringIO -else: - from StringIO import StringIO +import textwrap ACTION_TYPES_THAT_DONT_NEED_A_VALUE = [argparse._StoreTrueAction, diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py index 288e0821..da44e726 100644 --- a/tests/test_configargparse.py +++ b/tests/test_configargparse.py @@ -8,17 +8,13 @@ import tempfile import types import unittest +from io import StringIO try: import mock except ImportError: from unittest import mock -if sys.version_info >= (3, 0): - from io import StringIO -else: - from StringIO import StringIO - if sys.version_info >= (3, 10): OPTIONAL_ARGS_STRING="options" else: From 96968e8ccf6b0a4c8e22fa58ab1ffdf916c42d06 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Mon, 16 Jun 2025 01:48:56 +0200 Subject: [PATCH 2/4] also remove usage of old external "mock" module --- setup.py | 1 - tests/test_configargparse.py | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 116db247..1a151fb0 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,6 @@ def launch_http_server(directory): install_requires = [] tests_require = [ - 'mock', 'PyYAML', 'pytest', ] diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py index da44e726..fe64fd43 100644 --- a/tests/test_configargparse.py +++ b/tests/test_configargparse.py @@ -9,11 +9,7 @@ import types import unittest from io import StringIO - -try: - import mock -except ImportError: - from unittest import mock +from unittest import mock if sys.version_info >= (3, 10): OPTIONAL_ARGS_STRING="options" From e26173ff27aae02ce15e06c6cdf52aee5f1ec7ac Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Fri, 4 Jul 2025 12:13:27 +0200 Subject: [PATCH 3/4] redo merge --- tests/test_configargparse.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py index 4b130316..156b6ffe 100644 --- a/tests/test_configargparse.py +++ b/tests/test_configargparse.py @@ -8,9 +8,10 @@ import tempfile import types import unittest -import textwrap -from io import StringIO from unittest import mock +import textwrap + +from io import BytesIO, StringIO if sys.version_info >= (3, 10): OPTIONAL_ARGS_STRING = "options" From 6f096435bc44491937e168d2e159242a1c167a13 Mon Sep 17 00:00:00 2001 From: Alexandre Detiste Date: Fri, 4 Jul 2025 12:16:26 +0200 Subject: [PATCH 4/4] re-add old "toml" for now, tomllib/tomli should be prefered --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index d5beed8a..82c70afe 100644 --- a/setup.py +++ b/setup.py @@ -82,6 +82,7 @@ def launch_http_server(directory): install_requires = [] tests_require = [ "black", + "toml", "PyYAML", "pytest", "pytest-cov",