Minor tweaks to update #197

- Formatting/blacken
- Modern pytest style asserts and 'raises' use

Author: bitprophet

invoke/collection.py

@@ -310,8 +310,8 @@ def add_collection(self, coll, name=None, default=None):
         self.collections[name] = coll
         if default:
             if self.default:
-                msg = "'%s' cannot be the default because '%s' already is!"
-                raise ValueError(msg % (name, self.default))
+                msg = "'{}' cannot be the default because '{}' already is!"
+                raise ValueError(msg.format(name, self.default))
             self.default = coll
 
     def _split_path(self, path):
@@ -383,7 +383,9 @@ def task_with_config(self, name):
             if not self.default:
                 raise ValueError("This collection has no default task.")
             if isinstance(self.default, Collection):
-                return self._task_with_merged_config(self.default.name, '', ours)
+                return self._task_with_merged_config(
+                    self.default.name, "", ours
+                )
             else:
                 return self[self.default], ours
         # Normalize name to the format we're expecting

tests/collection.py

@@ -363,11 +363,10 @@ def can_take_module_objects(self):
             assert "integration" in self.c.collections
 
         def allows_specifying_defaultness(self):
-            collection = Collection('foo')
+            collection = Collection("foo")
             self.c.add_collection(collection, default=True)
-            eq_(self.c.default, collection)
+            assert self.c.default is collection
 
-        @raises(ValueError)
         def raises_ValueError_if_collection_without_name(self):
             # Aka non-root collections must either have an explicit name given
             # via kwarg, have a name attribute set, or be a module with
@@ -382,12 +381,12 @@ def raises_ValueError_if_collection_named_same_as_task(self):
             with raises(ValueError):
                 self.c.add_collection(Collection("sub"))
 
-        @raises(ValueError)
         def raises_ValueError_on_multiple_defaults(self):
             t1 = Task(_func, default=True)
-            self.c.add_task(t1, 'foo')
-            collection = Collection('bar')
-            self.c.add_collection(collection, default=True)
+            self.c.add_task(t1, "foo")
+            collection = Collection("bar")
+            with raises(ValueError):
+                self.c.add_collection(collection, default=True)
 
     class getitem:
         "__getitem__"
@@ -422,10 +421,10 @@ def honors_own_default_task_with_no_args(self):
 
         def honors_own_default_subcollection(self):
             task = Task(_func, default=True)
-            sub = Collection('sub')
+            sub = Collection("sub")
             sub.add_task(task, default=True)
             self.c.add_collection(sub, default=True)
-            eq_(self.c[''], task)
+            assert self.c[""] == task
 
         def honors_subcollection_default_tasks_on_subcollection_name(self):
             sub = Collection.from_module(load("decorators"))