Merge pull request #17 from WindSoilder/ci_format_check

fix CI check logic.  And format code.

Author: njsmith

ci/travis.sh

@@ -55,7 +55,7 @@ pip install -U pip setuptools wheel
 
 if [ "$CHECK_FORMATTING" = "1" ]; then
     pip install black
-    if black --check --diff -l 79 setup.py exceptiongroup; then
+    if ! black --check --diff setup.py exceptiongroup; then
         cat <<EOF
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

exceptiongroup/_tests/test_scripts/ipython_custom_exc.py

@@ -14,6 +14,7 @@ def custom_excepthook(*args):
 sys.excepthook = custom_excepthook
 
 import IPython
+
 ip = IPython.get_ipython()
 
 

exceptiongroup/_tests/test_scripts/simple_excepthook.py

@@ -18,6 +18,4 @@ def exc2_fn():
 
 
 # This should be printed nicely, because we overrode sys.excepthook
-raise exceptiongroup.ExceptionGroup(
-    "demo", [exc1_fn(), exc2_fn()], ["a", "b"],
-)
+raise exceptiongroup.ExceptionGroup("demo", [exc1_fn(), exc2_fn()], ["a", "b"])

exceptiongroup/_tests/test_tools.py

@@ -24,7 +24,7 @@ def test_split_when_all_exception_matched():
     group = ExceptionGroup(
         "Many Errors",
         [RuntimeError("Runtime Error1"), RuntimeError("Runtime Error2")],
-        ["Runtime Error1", "Runtime Error2"]
+        ["Runtime Error1", "Runtime Error2"],
     )
     matched, unmatched = split(RuntimeError, group)
     assert matched is group
@@ -35,7 +35,7 @@ def test_split_when_all_exception_unmatched():
     group = ExceptionGroup(
         "Many Errors",
         [RuntimeError("Runtime Error1"), RuntimeError("Runtime Error2")],
-        ["Runtime Error1", "Runtime Error2"]
+        ["Runtime Error1", "Runtime Error2"],
     )
     matched, unmatched = split(ValueError, group)
     assert matched is None
@@ -46,31 +46,27 @@ def test_split_when_contains_matched_and_unmatched():
     error1 = RuntimeError("Runtime Error1")
     error2 = ValueError("Value Error2")
     group = ExceptionGroup(
-        "Many Errors",
-        [error1, error2],
-        ['Runtime Error1', 'Value Error2']
+        "Many Errors", [error1, error2], ["Runtime Error1", "Value Error2"]
     )
     matched, unmatched = split(RuntimeError, group)
     assert isinstance(matched, ExceptionGroup)
     assert isinstance(unmatched, ExceptionGroup)
     assert matched.exceptions == [error1]
     assert matched.message == "Many Errors"
-    assert matched.sources == ['Runtime Error1']
+    assert matched.sources == ["Runtime Error1"]
     assert unmatched.exceptions == [error2]
     assert unmatched.message == "Many Errors"
-    assert unmatched.sources == ['Value Error2']
+    assert unmatched.sources == ["Value Error2"]
 
 
 def test_split_with_predicate():
     def _match(err):
-        return str(err) != 'skip'
+        return str(err) != "skip"
 
     error1 = RuntimeError("skip")
     error2 = RuntimeError("Runtime Error")
     group = ExceptionGroup(
-        "Many Errors",
-        [error1, error2],
-        ['skip', 'Runtime Error']
+        "Many Errors", [error1, error2], ["skip", "Runtime Error"]
     )
     matched, unmatched = split(RuntimeError, group, match=_match)
     assert matched.exceptions == [error2]

exceptiongroup/_tools.py

@@ -124,11 +124,9 @@ def __exit__(self, etype, exc, tb):
                     exceptiongroup_catch_exc = handler_exc
                 else:
                     exceptiongroup_catch_exc = ExceptionGroup(
-                        "caught {}".format(
-                            self._exc_type.__class__.__name__
-                        ),
+                        "caught {}".format(self._exc_type.__class__.__name__),
                         [handler_exc, rest],
-                        ["exception raised by handler", "uncaught exceptions"]
+                        ["exception raised by handler", "uncaught exceptions"],
                     )
             else:
                 exceptiongroup_catch_exc = rest

pyproject.toml

@@ -4,3 +4,6 @@ filename = "docs/source/history.rst"
 directory = "newsfragments"
 underlines = ["-", "~", "^"]
 issue_format = "`#{issue} <https://github.com/python-trio/exceptiongroup/issues/{issue}>`__"
+
+[tool.black]
+line-length = 79

setup.py

@@ -14,12 +14,8 @@
     author_email="njs@pobox.com",
     license="MIT -or- Apache License 2.0",
     packages=find_packages(),
-    install_requires=[
-        "trio",
-    ],
-    keywords=[
-        "async", "exceptions", "error handling",
-    ],
+    install_requires=["trio"],
+    keywords=["async", "exceptions", "error handling"],
     python_requires=">=3.5",
     classifiers=[
         "License :: OSI Approved :: MIT License",