mach: remove python2 compatibility code (#33410)

* util.py: Remove six

We don't need to support python2 anymore, so we can just use
`str(x)` instead of `six.ensure_str(x)`

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* config.py: Remove six

We don't need to support python2 anymore, so we can just use
`str(x)` instead of `six.ensure_str(x)`

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* main.py: Remove six

We don't need to support python2 anymore, so we can just use
`str(x)` instead of `six.ensure_str(x)`

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* main.py: Fix `--settings` being ignored

Previously `paths` was unused in this function,
and the usage for the settings_file would have no effect.

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* terminal.py: Remove `six`

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* registrar.py: Remove `six`

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* mach/util.py: Remove `six`

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

* mach: Remove python2 from the list of programming languages

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

---------

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2024-09-11 20:25:25 +02:00 committed by GitHub
parent ed5dc43f16
commit b42f5eaa17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 13 additions and 25 deletions

View file

@ -26,8 +26,7 @@ setup(
'Development Status :: 5 - Production/Stable',
'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
'Natural Language :: English',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.10',
],
install_requires=[
'blessings',