From 20f90edf8d14502e580bbce90a9701b4da4c95d9 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Wed, 2 May 2018 09:13:37 +0300 Subject: [PATCH] async: rename to async_reader async is becoming a reserved word in Python 3.7 --- amodem/__main__.py | 4 ++-- amodem/{async.py => async_reader.py} | 0 amodem/tests/{test_async.py => test_async_reader.py} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename amodem/{async.py => async_reader.py} (100%) rename amodem/tests/{test_async.py => test_async_reader.py} (81%) diff --git a/amodem/__main__.py b/amodem/__main__.py index 9c97286..18bbc6b 100644 --- a/amodem/__main__.py +++ b/amodem/__main__.py @@ -8,7 +8,7 @@ import zlib import pkg_resources -from . import async +from . import async_reader from . import audio from . import calib from . import main @@ -77,7 +77,7 @@ def FileType(mode, interface_factory=None): assert audio_interface is not None if 'r' in mode: s = audio_interface.recorder() - return async.AsyncReader(stream=s, bufsize=s.bufsize) + return async_reader.AsyncReader(stream=s, bufsize=s.bufsize) if 'w' in mode: return audio_interface.player() diff --git a/amodem/async.py b/amodem/async_reader.py similarity index 100% rename from amodem/async.py rename to amodem/async_reader.py diff --git a/amodem/tests/test_async.py b/amodem/tests/test_async_reader.py similarity index 81% rename from amodem/tests/test_async.py rename to amodem/tests/test_async_reader.py index 1a5322d..fb33398 100644 --- a/amodem/tests/test_async.py +++ b/amodem/tests/test_async_reader.py @@ -1,7 +1,7 @@ import mock import time import pytest -from amodem import async +from amodem import async_reader import logging logging.basicConfig(format='%(message)s') @@ -13,7 +13,7 @@ def test_async_reader(): return b'\x00' * n s = mock.Mock() s.read = _read - r = async.AsyncReader(s, 1) + r = async_reader.AsyncReader(s, 1) n = 5 assert r.read(n) == b'\x00' * n @@ -25,6 +25,6 @@ def test_async_reader(): def test_async_reader_error(): s = mock.Mock() s.read.side_effect = IOError() - r = async.AsyncReader(s, 1) + r = async_reader.AsyncReader(s, 1) with pytest.raises(IOError): r.read(3)