From 102ffc69e8f0a8a82406f7f8a1ffaa722da79de7 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Thu, 20 Dec 2018 11:57:44 +0100 Subject: [PATCH] add issue references to the todos --- src/_pytest/config/__init__.py | 2 ++ src/_pytest/python.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py index 3f7c06749..051eda79d 100644 --- a/src/_pytest/config/__init__.py +++ b/src/_pytest/config/__init__.py @@ -270,6 +270,7 @@ class PytestPluginManager(PluginManager): opts = {} if opts is not None: # TODO: DeprecationWarning, people should use hookimpl + # https://github.com/pytest-dev/pytest/issues/4562 known_marks = {m.name for m in getattr(method, "pytestmark", [])} for name in ("tryfirst", "trylast", "optionalhook", "hookwrapper"): @@ -286,6 +287,7 @@ class PytestPluginManager(PluginManager): if name.startswith("pytest_"): # todo: deprecate hookspec hacks + # https://github.com/pytest-dev/pytest/issues/4562 known_marks = {m.name for m in getattr(method, "pytestmark", [])} opts = { "firstresult": hasattr(method, "firstresult") diff --git a/src/_pytest/python.py b/src/_pytest/python.py index a508dbe24..48a50178f 100644 --- a/src/_pytest/python.py +++ b/src/_pytest/python.py @@ -1290,6 +1290,8 @@ class Function(FunctionMixin, nodes.Item, fixtures.FuncargnamesCompatAttr): self.keywords.update(keywords) # todo: this is a hell of a hack + # https://github.com/pytest-dev/pytest/issues/4569 + self.keywords.update( dict.fromkeys( [