From 30294ee09628cfd16715d6986b1834e756290a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Veres-Szentkir=C3=A1lyi?= Date: Mon, 19 Apr 2021 16:23:40 +0200 Subject: [PATCH] removed six --- pysstv/color.py | 1 - pysstv/grayscale.py | 1 - pysstv/sstv.py | 6 +----- pysstv/tests/test_sstv.py | 7 ++----- requirements.txt | 1 - setup.py | 2 +- 6 files changed, 4 insertions(+), 14 deletions(-) diff --git a/pysstv/color.py b/pysstv/color.py index 703240c..be8096f 100644 --- a/pysstv/color.py +++ b/pysstv/color.py @@ -1,6 +1,5 @@ #!/usr/bin/env python from __future__ import division -from six.moves import range, zip from pysstv.sstv import byte_to_freq, FREQ_BLACK, FREQ_WHITE, FREQ_VIS_START from pysstv.grayscale import GrayscaleSSTV from itertools import chain diff --git a/pysstv/grayscale.py b/pysstv/grayscale.py index 2b106d8..75472aa 100644 --- a/pysstv/grayscale.py +++ b/pysstv/grayscale.py @@ -1,7 +1,6 @@ #!/usr/bin/env python from __future__ import division -from six.moves import range from pysstv.sstv import SSTV, byte_to_freq diff --git a/pysstv/sstv.py b/pysstv/sstv.py index e69f020..5cc5f77 100644 --- a/pysstv/sstv.py +++ b/pysstv/sstv.py @@ -1,10 +1,6 @@ #!/usr/bin/env python from __future__ import division, with_statement -from six.moves import range -from six.moves import map -from six.moves import zip -from six import PY3 from math import sin, pi from random import random from contextlib import closing @@ -55,7 +51,7 @@ class SSTV(object): wav.setnchannels(self.nchannels) wav.setsampwidth(self.bits // 8) wav.setframerate(self.samples_per_sec) - wav.writeframes(data if PY3 else data.tostring()) + wav.writeframes(data) def gen_samples(self): """generates discrete samples from gen_values() diff --git a/pysstv/tests/test_sstv.py b/pysstv/tests/test_sstv.py index 4a92af0..4f59612 100644 --- a/pysstv/tests/test_sstv.py +++ b/pysstv/tests/test_sstv.py @@ -1,10 +1,8 @@ import unittest +from io import BytesIO from itertools import islice -from six.moves import zip import mock from mock import MagicMock -from six import BytesIO -from six import PY2 import hashlib from pysstv import sstv @@ -68,8 +66,7 @@ class TestSSTV(unittest.TestCase): bio = BytesIO() bio.close = MagicMock() # ignore close() so we can .getvalue() mock_open = MagicMock(return_value=bio) - ns = '__builtin__' if PY2 else 'builtins' - with mock.patch('{0}.open'.format(ns), mock_open): + with mock.patch('builtins.open', mock_open): self.s.write_wav('unittest.wav') expected = 'dd7eed880ab3360fb79ce09c469deee2' data = bio.getvalue() diff --git a/requirements.txt b/requirements.txt index 0eda817..871fae8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -six==1.10.0 Pillow==8.1.1 mock==1.0.1 nose==1.3.0 diff --git a/setup.py b/setup.py index 7a4f114..5f7a6fa 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setup( ], }, keywords='HAM SSTV slow-scan television Scottie Martin Robot Pasokon', - install_requires = ['Pillow', 'six'], + install_requires = ['Pillow'], license='MIT', classifiers=[ 'Development Status :: 4 - Beta',