remove dependency on six #177
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zeromind
force-pushed
the
remove_six
branch
2 times, most recently
from
f878ac0
to
58f45f3
Compare
as Python2 is not supported anymore, remove the compatiblility layer provided by the six module this fixes `TXT::test_parse` and `test_validate_strings` by creating the proper output bytes in `_unescapify_from()`
zeromind
commented
Feb 4, 2022
There was a problem hiding this comment.
pytest without e92e477: 10 failed, 184 passed, 331 warnings
=================================================================================================================================================================================================================================== short test summary info ===================================================================================================================================================================================================================================
FAILED tests/allocator_test.py::AllocatorTest::test_delegation_not_subnet - sqlalchemy.exc.IntegrityError: (MySQLdb._exceptions.IntegrityError) (1062, "Duplicate entry '83076749736557242056487941267521536-64-9' for key 'address'")
FAILED tests/commands_test.py::CommandsTest::test_pool_report - AssertionError: assert '444 IPs are still free' in 'Pool pool\ndays 1 7 30\nusage 24 ... 64\n444.0 IPs are still free\nBased on data from the last 30 days, the pool will be full in 208.1 days.\n'
FAILED tests/commands_test.py::CommandsTest::test_pool_reportv6 - AssertionError: assert '448 /64 blocks are still free' in 'Pool pool\ndays 1 7 30\nusage 20 ... 60\n448.0 /64 blocks are still free\nBased on data from the last 30 days, the pool will be full in 224.0 days.\n'
FAILED tests/dns_test.py::test_validate_strings - ValueError: Invalid escape sequence: \223
FAILED tests/dns_test.py::TXT::test_parse - dim.errors.InvalidParameterError: Invalid escape sequence: \100
FAILED tests/dns_test.py::RRReferencesTest::test_edit_comment_ttl - AssertionError: assert {'graph': {1:...}], 'root': 2} == {'graph': {1:...}], 'root': 2}
FAILED tests/dns_test.py::RRReferencesTest::test_get_references - AssertionError: assert {'graph': {1:...}], 'root': 2} == {'graph': {1:...}], 'root': 2}
FAILED tests/pool_test.py::PoolTest::test_list_ippools_pagination - TypeError: _ippool_query() missing 1 required positional argument: 'layer3domain'
FAILED tests/pool_test.py::PoolTest::test_priority - TypeError: unsupported operand type(s) for +=: 'NoneType' and 'str'
FAILED tests/rights_test.py::RightsMatrixTest::test_ippool_list - AssertionError: assert [{'can_alloca...'vlan': None}] == [{'can_alloca...'vlan': None}]
================================================================================================================================================================================================================== 10 failed, 184 passed, 331 warnings in 112.21s (0:01:52) ===================================================================================================================================================================================================================
pytest with e92e477: 8 failed, 186 passed, 334 warnings
=================================================================================================================================================================================================================================== short test summary info ===================================================================================================================================================================================================================================
FAILED tests/allocator_test.py::AllocatorTest::test_delegation_not_subnet - sqlalchemy.exc.IntegrityError: (MySQLdb._exceptions.IntegrityError) (1062, "Duplicate entry '83076749736557242056487941267521536-64-9' for key 'address'")
FAILED tests/commands_test.py::CommandsTest::test_pool_report - AssertionError: assert '444 IPs are still free' in 'Pool pool\ndays 1 7 30\nusage 24 ... 64\n444.0 IPs are still free\nBased on data from the last 30 days, the pool will be full in 208.1 days.\n'
FAILED tests/commands_test.py::CommandsTest::test_pool_reportv6 - AssertionError: assert '448 /64 blocks are still free' in 'Pool pool\ndays 1 7 30\nusage 20 ... 60\n448.0 /64 blocks are still free\nBased on data from the last 30 days, the pool will be full in 224.0 days.\n'
FAILED tests/dns_test.py::RRReferencesTest::test_edit_comment_ttl - AssertionError: assert {'graph': {1:...}], 'root': 2} == {'graph': {1:...}], 'root': 2}
FAILED tests/dns_test.py::RRReferencesTest::test_get_references - AssertionError: assert {'graph': {1:...}], 'root': 2} == {'graph': {1:...}], 'root': 2}
FAILED tests/pool_test.py::PoolTest::test_list_ippools_pagination - TypeError: _ippool_query() missing 1 required positional argument: 'layer3domain'
FAILED tests/pool_test.py::PoolTest::test_priority - TypeError: unsupported operand type(s) for +=: 'NoneType' and 'str'
FAILED tests/rights_test.py::RightsMatrixTest::test_ippool_list - AssertionError: assert [{'can_alloca...'vlan': None}] == [{'can_alloca...'vlan': None}]
=================================================================================================================================================================================================================== 8 failed, 186 passed, 334 warnings in 109.51s (0:01:49) ===================================================================================================================================================================================================================
|
Takes care of 2 string validation tests from #198 |
|
As far as I can tell, this looks okay. Lets merge it |
Srudush
approved these changes
Feb 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove dependency on the
sixmodule, which was left over from the Python 2/3 compat.resolves #176