From 8324350f2e1f568386176e7598b3256a258e98ee Mon Sep 17 00:00:00 2001 From: Friedrich Lindenberg Date: Thu, 31 Jan 2019 14:56:19 +0100 Subject: [PATCH] Try to fix up tests, Python 3.8 warnings --- .travis.yml | 2 +- dataset/util.py | 6 +++++- test/test_dataset.py | 1 + tox.ini | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 tox.ini diff --git a/.travis.yml b/.travis.yml index 70e3e83..ee80814 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: python python: + - '3.7' - '3.6' - '3.5' - - '3.4' - '2.7' services: - mysql diff --git a/dataset/util.py b/dataset/util.py index b1a0390..3282d03 100644 --- a/dataset/util.py +++ b/dataset/util.py @@ -1,6 +1,10 @@ import six from hashlib import sha1 -from collections import OrderedDict, Iterable +try: + from collections.abc import Iterable +except ImportError: + from collections as Iterable +from collections import OrderedDict from six.moves.urllib.parse import urlparse QUERY_STEP = 1000 diff --git a/test/test_dataset.py b/test/test_dataset.py index 6c5be07..a6c8f89 100644 --- a/test/test_dataset.py +++ b/test/test_dataset.py @@ -1,3 +1,4 @@ +# coding: utf-8 from __future__ import unicode_literals import os diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..7f2d9e1 --- /dev/null +++ b/tox.ini @@ -0,0 +1,5 @@ +[tox] +envlist = py27,py37 +[textenv] +deps=nose +commands=python setup.py test