From d5f7cfd301ff8679d3f8eb0b3568fdcfff3b3c61 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Sun, 10 Mar 2019 10:30:14 +0100 Subject: [PATCH 1/2] Add python 3.7 to tox.ini and travis.yml --- .travis.yml | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3627fd..c77f38c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ cache: python: - "2.7" - "3.5" + - "3.7" install: - pip install tox-travis - sh get_testdata.sh diff --git a/tox.ini b/tox.ini index 09f70f4..bb55395 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py35 +envlist = py27,py35,py37 [testenv] deps=nose commands=nosetests From 85eb7249ad1439be091a1d97cbe1b071b24acef1 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Sun, 10 Mar 2019 10:34:02 +0100 Subject: [PATCH 2/2] Use break instead of StopIteration - fixes #17 --- galvani/BioLogic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galvani/BioLogic.py b/galvani/BioLogic.py index e5bdb17..07172b5 100644 --- a/galvani/BioLogic.py +++ b/galvani/BioLogic.py @@ -234,7 +234,7 @@ def read_VMP_modules(fileobj, read_module_data=True): while True: module_magic = fileobj.read(len(b'MODULE')) if len(module_magic) == 0: # end of file - raise StopIteration + break elif module_magic != b'MODULE': raise ValueError("Found %r, expecting start of new VMP MODULE" % module_magic)