mirror of
https://github.com/dnet/pySSTV.git
synced 2025-12-06 07:12:00 +01:00
removed six
This commit is contained in:
parent
5a596df09c
commit
30294ee096
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
six==1.10.0
|
||||
Pillow==8.1.1
|
||||
mock==1.0.1
|
||||
nose==1.3.0
|
||||
|
|
|
|||
Loading…
Reference in a new issue