From c6310ae566a1b7ff2526ffdcb585fde3e4ae2c77 Mon Sep 17 00:00:00 2001 From: Pawel Kowalik Date: Wed, 1 Apr 2026 01:59:04 +0200 Subject: [PATCH] Remove six dependencies. Release 4.7.1 --- setup.py | 3 +-- test/test_DomainConnectTemplates.py | 29 ++++++++++++++--------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index 389202d..7dcc7f9 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ def run(self): setup( name='domainconnectzone', - version='4.5.0', + version='4.7.1', description=DESCRIPTION, author='domainconnect.org', url='https://github.com/Domain-Connect/domainconnectzone', @@ -59,7 +59,6 @@ def run(self): packages=find_packages(exclude=["test", "test.*"]), install_requires=[ 'ipy>=1.1', - 'six>=1.16.0', ], extras_require={ 'testing': [ diff --git a/test/test_DomainConnectTemplates.py b/test/test_DomainConnectTemplates.py index d4cc0f1..db020a2 100644 --- a/test/test_DomainConnectTemplates.py +++ b/test/test_DomainConnectTemplates.py @@ -1,6 +1,5 @@ import json import unittest -import six from domainconnectzone import DomainConnectTemplates, InvalidData, InvalidTemplate import sys @@ -13,7 +12,7 @@ class TestDomainConnectTemplates(unittest.TestCase): @patch('os.path.isfile', return_value=True) @patch('os.path.isdir', return_value=True) @patch('os.access', return_value=True) - @patch('six.moves.builtins.open', new_callable=mock_open, read_data=json.dumps( + @patch('builtins.open', new_callable=mock_open, read_data=json.dumps( { "properties": { "providerId": { @@ -60,7 +59,7 @@ def setUp(self, mock_open, mock_access, mock_isfile, mock_isdir): @patch('os.path.isdir') @patch('os.access') @patch('os.listdir') - @patch('six.moves.builtins.open', new_callable=mock_open, read_data='{"providerId": "Provider", "serviceId": "Service"}') + @patch('builtins.open', new_callable=mock_open, read_data='{"providerId": "Provider", "serviceId": "Service"}') def test_templates_success(self, mock_open, mock_listdir, mock_access, mock_isdir): mock_isdir.return_value = True mock_access.return_value = True @@ -90,7 +89,7 @@ def test_malformed_json(self, mock_listdir, mock_access, mock_isdir): mock_access.return_value = True mock_listdir.return_value = ['malformed.json'] malformed_json_content = '{"providerId": "Provider", "serviceId": "Service"' - with patch('six.moves.builtins.open', mock_open(read_data=malformed_json_content)): + with patch('builtins.open', mock_open(read_data=malformed_json_content)): d = DomainConnectTemplates() templates = d.templates self.assertEqual(len(templates), 0) # Malformed JSON should be ignored @@ -104,7 +103,7 @@ def test_incorrect_template_content(self, mock_listdir, mock_access, mock_isdir) mock_access.return_value = True mock_listdir.return_value = ['provider.service.json'] correct_json_content = '{"providerId": "Provider"}' - with patch('six.moves.builtins.open', mock_open(read_data=correct_json_content)): + with patch('builtins.open', mock_open(read_data=correct_json_content)): d = DomainConnectTemplates() templates = d.templates self.assertEqual(len(templates), 0) # File with incomplete template should be ignored @@ -118,7 +117,7 @@ def test_incorrect_naming_convention(self, mock_listdir, mock_access, mock_isdir mock_access.return_value = True mock_listdir.return_value = ['incorrectname.json'] correct_json_content = '{"providerId": "Provider", "serviceId": "Service"}' - with patch('six.moves.builtins.open', mock_open(read_data=correct_json_content)): + with patch('builtins.open', mock_open(read_data=correct_json_content)): d = DomainConnectTemplates() templates = d.templates self.assertEqual(len(templates), 0) # File with incorrect naming should be ignored @@ -145,7 +144,7 @@ def test_custom_template_path(self, mock_listdir, mock_access, mock_isdir): mock_access.return_value = True mock_listdir.return_value = ['provider.service.json'] valid_json_content = '{"providerId": "Provider", "serviceId": "Service"}' - with patch('six.moves.builtins.open', mock_open(read_data=valid_json_content)): + with patch('builtins.open', mock_open(read_data=valid_json_content)): d = DomainConnectTemplates(template_path=custom_path) templates = d.templates self.assertEqual(len(templates), 1) @@ -167,7 +166,7 @@ def test_schema_loading(self, mock_listdir, mock_access, mock_isfile, mock_isdir mock_open_instance.side_effect = [mock_open(read_data=valid_schema_content).return_value, mock_open(read_data=json.dumps(self.template_base)).return_value] - with patch('six.moves.builtins.open', mock_open_instance): + with patch('builtins.open', mock_open_instance): d = DomainConnectTemplates() templates = d.templates self.assertEqual(d.schema, {"some": "schema"}) @@ -374,7 +373,7 @@ class TestDomainConnectTemplatesUpdate(unittest.TestCase): @patch('os.path.isfile', return_value=True) @patch('os.path.isdir', return_value=True) @patch('os.access', return_value=True) - @patch('six.moves.builtins.open', new_callable=mock_open, read_data=json.dumps({ + @patch('builtins.open', new_callable=mock_open, read_data=json.dumps({ "providerId": "provider1", "serviceId": "service1", "records": [] })) def test_update_existing_template(self, mock_open, mock_access, mock_isfile, mock_isdir, mock_listdir): @@ -396,7 +395,7 @@ def test_update_existing_template(self, mock_open, mock_access, mock_isfile, mo @patch('os.path.isdir', return_value=True) @patch('os.access', side_effect=[True, False]) @patch('os.listdir', return_value=['provider1.service1.json', 'invalid.json', 'provider2.service2.json']) - @patch('six.moves.builtins.open', new_callable=mock_open, read_data=json.dumps({ + @patch('builtins.open', new_callable=mock_open, read_data=json.dumps({ "providerId": "provider1", "serviceId": "service1", "records": [] })) def test_update_template_folder_not_writable(self, mock_open, mock_listdir, mock_access, mock_isdir): @@ -410,7 +409,7 @@ def test_update_template_folder_not_writable(self, mock_open, mock_listdir, mock @patch('os.path.isdir', return_value=True) @patch('os.access', side_effect=[True, True]) @patch('os.listdir', return_value=['provider1.service1.json', 'invalid.json', 'provider2.service2.json']) - @patch('six.moves.builtins.open', new_callable=mock_open, read_data=json.dumps({ + @patch('builtins.open', new_callable=mock_open, read_data=json.dumps({ "providerId": "provider1", "serviceId": "service1", "records": [] })) def test_update_template_not_found(self, mock_open, mock_listdir, mock_access, mock_isdir): @@ -426,13 +425,13 @@ class TestDomainConnectTemplatesCreate(unittest.TestCase): @patch('os.path.isfile', return_value=True) @patch('os.path.isdir', return_value=True) @patch('os.access', return_value=True) - @patch('six.moves.builtins.open', new_callable=mock_open, read_data=json.dumps({})) + @patch('builtins.open', new_callable=mock_open, read_data=json.dumps({})) def setUp(self, mock_open, mock_access, mock_isfile, mock_isdir): self._dct = DomainConnectTemplates('/valid/path') @patch('os.listdir', return_value=[]) @patch('os.access', return_value=True) - @patch('six.moves.builtins.open', new_callable=mock_open) + @patch('builtins.open', new_callable=mock_open) def test_create_new_template(self, mock_open, mock_access, mock_listdir): template = {"providerId": "provider2", "serviceId": "service2", "records": []} @@ -450,7 +449,7 @@ def test_create_new_template(self, mock_open, mock_access, mock_listdir): @patch('os.listdir', return_value=[]) @patch('os.access', return_value=False) - @patch('six.moves.builtins.open', new_callable=mock_open) + @patch('builtins.open', new_callable=mock_open) def test_create_template_folder_not_writable(self, mock_open, mock_access, mock_listdir): template = {"providerId": "provider2", "serviceId": "service2", "content": "new content"} @@ -460,7 +459,7 @@ def test_create_template_folder_not_writable(self, mock_open, mock_access, mock_ @patch('os.listdir', return_value=["provider1.service1.json"]) @patch('os.access', return_value=True) - @patch('six.moves.builtins.open', new_callable=mock_open, read_data=json.dumps( + @patch('builtins.open', new_callable=mock_open, read_data=json.dumps( {"providerId": "provider1", "serviceId": "service1", "records": []} )) def test_create_template_already_exists(self, mock_open, mock_access, mock_listdir):