From 5526559bfa54488357c17f52720d9715bb0abec3 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 10 Apr 2015 12:35:31 +0200 Subject: Merging Victor's commit into our handful of 1.0.8 commits. Fix Python 3 issues * Use relative imports * Fix bytes/unicode issues in tests Conflicts: pyeclib/core.py test/test_pyeclib_api.py --- pyeclib/core.py | 5 +---- pyeclib/ec_iface.py | 8 ++++---- test/test_pyeclib_api.py | 4 +++- test/test_pyeclib_c.py | 7 +++++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pyeclib/core.py b/pyeclib/core.py index d10e56e..26f14b2 100644 --- a/pyeclib/core.py +++ b/pyeclib/core.py @@ -21,10 +21,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from ec_iface import ECDriverError -from ec_iface import ECInsufficientFragments -from ec_iface import PyECLib_FRAGHDRCHKSUM_Types - +from .ec_iface import PyECLib_FRAGHDRCHKSUM_Types, ECDriverError, ECInsufficientFragments import math import pyeclib_c import sys diff --git a/pyeclib/ec_iface.py b/pyeclib/ec_iface.py index 48f4fd0..22b1f65 100644 --- a/pyeclib/ec_iface.py +++ b/pyeclib/ec_iface.py @@ -22,10 +22,10 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from enum import Enum -from enum import unique -from utils import create_instance -from utils import positive_int_value +from .enum import Enum +from .enum import unique +from .utils import create_instance +from .utils import positive_int_value def PyECLibVersion(z, y, x): diff --git a/test/test_pyeclib_api.py b/test/test_pyeclib_api.py index 21ebed6..c084f70 100644 --- a/test/test_pyeclib_api.py +++ b/test/test_pyeclib_api.py @@ -93,8 +93,10 @@ class TestPyECLibDriver(unittest.TestCase): # Create the dictionary of files to test with buf = ''.join(random.choice(ascii_letters) for i in range(size)) + if sys.version_info >= (3,): + buf = buf.encode('ascii') tmp_file = tempfile.NamedTemporaryFile() - tmp_file.write(buf.decode('utf-8')) + tmp_file.write(buf) self.files[size_str] = tmp_file def setUp(self): diff --git a/test/test_pyeclib_c.py b/test/test_pyeclib_c.py index 9827fd3..24440cd 100644 --- a/test/test_pyeclib_c.py +++ b/test/test_pyeclib_c.py @@ -23,6 +23,7 @@ import random from string import ascii_letters +import sys import tempfile import time import unittest @@ -111,8 +112,10 @@ class TestPyECLib(unittest.TestCase): # Create the dictionary of files to test with buf = ''.join(random.choice(ascii_letters) for i in range(size)) - tmp_file = tempfile.NamedTemporaryFile() - tmp_file.write(buf.decode('utf-8')) + if sys.version_info >= (3,): + buf = buf.encode('ascii') + tmp_file = tempfile.NamedTemporaryFile('w+b') + tmp_file.write(buf) self.files[size_str] = tmp_file def get_tmp_file(self, name): -- cgit v1.2.1