Fix Travis failures (#68)

* Reformatted with new version of black

* Update to modern jarvis parlance

* Flake8 has a new warning too

.travis.yml

@@ -1,13 +1,13 @@
 language: python
+dist: xenial
+os: linux
 
-# Travis doesn't support 3.7 by default, but if we run it on xenial it works
-matrix:
+jobs:
   fast_finish: true
   include:
   - python: 3.6
     env: MATRIX=py36
   - python: 3.7
-    sudo: required
     dist: bionic
     env: MATRIX=py37
   - python: pypy3

setup.py

@@ -33,7 +33,11 @@
     packages=find_packages(exclude=["doc", "tests"]),
     include_package_data=True,
     zip_safe=False,
-    install_requires=["setuptools", "lxml>=3.1.0", "six",],
+    install_requires=[
+        "setuptools",
+        "lxml>=3.1.0",
+        "six",
+    ],
     test_suite="tests",
     entry_points={
         "console_scripts": [

tests/test_diff.py

@@ -796,7 +796,10 @@ def test_match_insert_node(self):
         result = self._match(left, right)
         self.assertEqual(
             result,
-            [("/document/story", "/document/story"), ("/document", "/document"),],
+            [
+                ("/document/story", "/document/story"),
+                ("/document", "/document"),
+            ],
         )
 
     def test_entirely_different(self):
@@ -810,7 +813,12 @@ def test_entirely_different(self):
     <h1>Inserted <i>Node</i></h1>
 </document>"""
         result = self._match(left, right)
-        self.assertEqual(result, [("/document", "/document"),])
+        self.assertEqual(
+            result,
+            [
+                ("/document", "/document"),
+            ],
+        )
 
 
 class FastMatchTests(unittest.TestCase):

tests/test_formatting.py

@@ -99,7 +99,12 @@ def test_rml_bug(self):
 </document>"""
         tree = etree.fromstring(before_diff)
         replacer = formatting.PlaceholderMaker(
-            text_tags=("para",), formatting_tags=("b", "u", "i",)
+            text_tags=("para",),
+            formatting_tags=(
+                "b",
+                "u",
+                "i",
+            ),
         )
         replacer.do_tree(tree)
         after_diff = """<document xmlns:diff="http://namespaces.shoobx.com/diff">

tests/testing.py

@@ -42,5 +42,5 @@ def compare_elements(left, right):
     assert left.attrib == right.attrib, "Attributes differ: %s" % path
     # We intentionally do NOT compare namespaces, they are allowed to differ
     assert len(left) == len(right), "Children differ: %s" % path
-    for l, r in zip(left.getchildren(), right.getchildren()):
-        compare_elements(l, r)
+    for litem, ritem in zip(left.getchildren(), right.getchildren()):
+        compare_elements(litem, ritem)