From 7cf3ddf7707b31c1598206b3ca5993ee12ffb21b Mon Sep 17 00:00:00 2001 From: km4yri Date: Mon, 2 Jan 2017 19:18:21 -0500 Subject: [PATCH] fix python 2/3 compatibility for xrange->range --- pysstv/color.py | 7 ++++++- pysstv/grayscale.py | 8 +++++++- pysstv/sstv.py | 7 ++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/pysstv/color.py b/pysstv/color.py index 40be640..e70709c 100644 --- a/pysstv/color.py +++ b/pysstv/color.py @@ -1,7 +1,12 @@ #!/usr/bin/env python from __future__ import division -from builtins import range # python 2/3 compatibility +try: # python 2/3 compatibility + xrange # will fail in python 3 +except NameError: + pass +else: + range = xrange 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 9a0c5e1..63ce0aa 100644 --- a/pysstv/grayscale.py +++ b/pysstv/grayscale.py @@ -1,7 +1,13 @@ #!/usr/bin/env python from __future__ import division -from builtins import range # python 2/3 compatibility + +try: # python 2/3 compatibility + xrange # will fail in python 3 +except NameError: + pass +else: + range = xrange from pysstv.sstv import SSTV, byte_to_freq diff --git a/pysstv/sstv.py b/pysstv/sstv.py index 735aa30..e2e417e 100644 --- a/pysstv/sstv.py +++ b/pysstv/sstv.py @@ -12,8 +12,13 @@ try: import itertools.izip as zip # python 2 except ImportError: pass # python 3 -from builtins import range # python 2/3 compatibility from itertools import cycle, chain +try: # python 2/3 compatibility + xrange # will fail in python 3 +except NameError: + pass +else: + range = xrange from array import array import wave