test: update tox and fix py3 failures

* Sequence is now in `collections.abc` and will be removed from
  `collections` in 3.8.
* zip() returns an iterator in Python 3 and must be wrapped with
  something like list() or tuple() to be realized.
* Remove support for 2.6.
* Add tox tests for 3.6 and 3.7.
* Update .travis.yml to match tox versions.

Author: scanny

.travis.yml

@@ -1,8 +1,9 @@
 language: python
 python:
-  - "3.6"
-  - "3.5"
   - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -r requirements.txt
 # command to run tests, e.g. python setup.py test

docx/bookmark.py

@@ -4,9 +4,9 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-from collections import Sequence
 from itertools import chain
 
+from docx.compat import Sequence
 from docx.oxml.ns import qn
 from docx.shared import lazyproperty
 

docx/compat.py

@@ -12,9 +12,13 @@
 # Python 3 versions
 # ===========================================================================
 
+if sys.version_info >= (3, 3):
+    from collections.abc import Sequence
+else:
+    from collections import Sequence  # noqa
+
 if sys.version_info >= (3, 0):
 
-    from collections.abc import Sequence
     from io import BytesIO
 
     def is_string(obj):
@@ -29,7 +33,6 @@ def is_string(obj):
 
 else:
 
-    from collections import Sequence  # noqa
     from StringIO import StringIO as BytesIO  # noqa
 
     def is_string(obj):

tests/test_bookmark.py

@@ -36,7 +36,7 @@ def it_provides_access_to_bookmarks_by_index(
         bookmarkStarts = tuple(element("w:bookmarkStart") for _ in range(3))
         bookmarkEnds = tuple(element("w:bookmarkEnd") for _ in range(3))
         _finder_prop_.return_value = finder_
-        finder_.bookmark_pairs = zip(bookmarkStarts, bookmarkEnds)
+        finder_.bookmark_pairs = list(zip(bookmarkStarts, bookmarkEnds))
         _Bookmark_.return_value = bookmark_
         bookmarks = Bookmarks(None)
 
@@ -51,7 +51,7 @@ def it_provides_access_to_bookmarks_by_slice(
         bookmarkStarts = tuple(element("w:bookmarkStart") for _ in range(4))
         bookmarkEnds = tuple(element("w:bookmarkEnd") for _ in range(4))
         _finder_prop_.return_value = finder_
-        finder_.bookmark_pairs = zip(bookmarkStarts, bookmarkEnds)
+        finder_.bookmark_pairs = list(zip(bookmarkStarts, bookmarkEnds))
         _Bookmark_.return_value = bookmark_
         bookmarks = Bookmarks(None)
 
@@ -69,7 +69,7 @@ def it_can_iterate_its_bookmarks(
         bookmarkStarts = tuple(element("w:bookmarkStart") for _ in range(3))
         bookmarkEnds = tuple(element("w:bookmarkEnd") for _ in range(3))
         _finder_prop_.return_value = finder_
-        finder_.bookmark_pairs = zip(bookmarkStarts, bookmarkEnds)
+        finder_.bookmark_pairs = list(zip(bookmarkStarts, bookmarkEnds))
         _Bookmark_.return_value = bookmark_
         bookmarks = Bookmarks(None)
 

tests/unitutil/mock.py

@@ -6,12 +6,10 @@
 
 import sys
 
-if sys.version_info >= (3, 3):
-    from unittest import mock  # noqa
+if sys.version_info > (3, 0):
     from unittest.mock import ANY, call, MagicMock  # noqa
     from unittest.mock import create_autospec, Mock, mock_open, patch, PropertyMock
 else:
-    import mock  # noqa
     from mock import ANY, call, MagicMock  # noqa
     from mock import create_autospec, Mock, patch, PropertyMock
 

tox.ini

@@ -15,32 +15,27 @@ python_functions = it_ they_ but_ and_it_
 testpaths = tests
 
 [tox]
-envlist = py26, py27, py34, py35, py36
+envlist = py27, py37
 
-[testenv]
+[testenv:py27]
 deps =
     behave
     lxml
+    mock
     pyparsing
     pytest
 
 commands =
     py.test -qx
-    behave --format progress --stop --tags=-wip
+    behave --format progress
 
-[testenv:py26]
+[testenv]
 deps =
-    importlib>=1.0.3
     behave
     lxml
-    mock
     pyparsing
     pytest
 
-[testenv:py27]
-deps =
-    behave
-    lxml
-    mock
-    pyparsing
-    pytest
+commands =
+    py.test -qx
+    behave --format progress