From b7f3cdd2c3035fae54e388b0f1529c08ba388baa Mon Sep 17 00:00:00 2001 From: nkarman Date: Sat, 15 Apr 2017 14:11:16 -0500 Subject: [PATCH] fixed for python 3 compatibility --- audiogen/__init__.py | 5 +++-- audiogen/filters.py | 4 ++-- audiogen/generators.py | 4 ++-- audiogen/noise.py | 3 +-- audiogen/sampler.py | 6 +++--- audiogen/util.py | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/audiogen/__init__.py b/audiogen/__init__.py index f8e104c..e015fd4 100644 --- a/audiogen/__init__.py +++ b/audiogen/__init__.py @@ -2,6 +2,7 @@ from .sampler import frame_rate from .sampler import write_wav + from .generators import tone from .generators import beep from .generators import silence @@ -14,6 +15,6 @@ from .util import loop from .util import play -from filters import band_pass -from filters import band_stop +from .filters import band_pass +from .filters import band_stop diff --git a/audiogen/filters.py b/audiogen/filters.py index 19e729e..872954e 100644 --- a/audiogen/filters.py +++ b/audiogen/filters.py @@ -8,8 +8,8 @@ import itertools import collections -import util -import sampler +from audiogen import util +from audiogen import sampler TWO_PI = 2 * math.pi diff --git a/audiogen/generators.py b/audiogen/generators.py index 2a8e651..f4c7b34 100644 --- a/audiogen/generators.py +++ b/audiogen/generators.py @@ -7,8 +7,8 @@ import math import itertools -import util -import sampler +from audiogen import util +from audiogen import sampler TWO_PI = 2 * math.pi diff --git a/audiogen/noise.py b/audiogen/noise.py index e169ffd..2411789 100644 --- a/audiogen/noise.py +++ b/audiogen/noise.py @@ -1,5 +1,4 @@ - -import util as util +from audiogen import util # Arcfour PRNG as a fast source of repeatable randomish numbers; totally unnecessary here, but simple. def arcfour(key, csbN=1): diff --git a/audiogen/sampler.py b/audiogen/sampler.py index 785c145..1517af7 100644 --- a/audiogen/sampler.py +++ b/audiogen/sampler.py @@ -16,7 +16,7 @@ import errno import contextlib -from StringIO import StringIO +import io from .util import hard_clip from .util import normalize @@ -61,7 +61,7 @@ def file_is_seekable(f): try: f.tell() logger.info("File is seekable!") - except IOError, e: + except IOError as e: if e.errno == errno.ESPIPE: return False else: @@ -133,7 +133,7 @@ def dummy(*args): def wave_module_patched(): '''True if wave module can write data size of 0xFFFFFFFF, False otherwise.''' - f = StringIO() + f = io() w = wave.open(f, "wb") w.setparams((1, 2, 44100, 0, "NONE", "no compression")) patched = True diff --git a/audiogen/util.py b/audiogen/util.py index 44506a8..d5867ef 100644 --- a/audiogen/util.py +++ b/audiogen/util.py @@ -10,7 +10,7 @@ from .noise import white_noise_samples from .noise import red_noise -import sampler +from audiogen import sampler def crop(gens, seconds=5, cropper=None): ''' @@ -110,8 +110,8 @@ def crop_at_zero_crossing(gen, seconds=5, error=0.1): # find min by sorting buffer samples, first by abs of sample, then by distance from optimal best = sorted(enumerate(end), key=lambda x: (math.fabs(x[1]),abs((buffer_length/2)-x[0]))) - print best[:10] - print best[0][0] + print(best[:10]) + print(best[0][0]) # todo: better logic when we don't have a perfect zero crossing #if best[0][1] != 0: