simplify name handling

Author: graingert

Lib/asyncio/base_events.py

@@ -464,23 +464,12 @@ def create_task(self, coro, **kwargs):
         Return a task object.
         """
         self._check_closed()
-        if self._task_factory is None:
-            task = tasks.Task(coro, loop=self, **kwargs)
-            if task._source_traceback:
-                del task._source_traceback[-1]
-        else:
-            task = None
-            name = None
-            try:
-                task = self._task_factory(self, coro, **kwargs)
-            except TypeError as e:
-                name = kwargs.pop("name", None)
-                if kwargs:
-                    raise
+        if self._task_factory is not None:
+            return self._task_factory(self, coro, **kwargs)
 
-            if task is None:
-                task = self._task_factory(self, coro, **kwargs)
-                task.set_name(name)
+        task = tasks.Task(coro, loop=self, **kwargs)
+        if task._source_traceback:
+            del task._source_traceback[-1]
         try:
             return task
         finally:

Lib/test/test_asyncio/test_base_events.py

@@ -1,6 +1,7 @@
 """Tests for base_events.py"""
 
 import concurrent.futures
+import contextlib
 import errno
 import math
 import platform
@@ -834,19 +835,21 @@ async def test():
 
     def test_create_named_task_with_custom_factory(self):
         def task_factory(loop, coro):
-            return asyncio.Task(coro, loop=loop)
+            assert False
 
         async def test():
             pass
 
-        loop = asyncio.new_event_loop()
-        loop.set_task_factory(task_factory)
-        task = loop.create_task(test(), name='test_task')
-        try:
-            self.assertEqual(task.get_name(), 'test_task')
-        finally:
-            loop.run_until_complete(task)
-            loop.close()
+        with (
+            contextlib.closing(asyncio.EventLoop()) as loop,
+            contextlib.closing(test()) as coro,
+        ):
+            loop.set_task_factory(task_factory)
+            with self.assertRaisesRegex(
+                TypeError,
+                r"got an unexpected keyword argument 'name'"
+            ):
+                loop.create_task(coro, name='test_task')
 
     def test_run_forever_keyboard_interrupt(self):
         # Python issue #22601: ensure that the temporary task created by