From 8a4d5227e25dfeaf9addb8b7b0ad17fa1f4c5b26 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Thu, 13 Feb 2020 12:31:48 +0200 Subject: [PATCH] Remove unused CallSpec2 fields _globalid, _globalparam --- src/_pytest/python.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/_pytest/python.py b/src/_pytest/python.py index 6402164f9..ced115815 100644 --- a/src/_pytest/python.py +++ b/src/_pytest/python.py @@ -789,8 +789,6 @@ class CallSpec2: self.funcargs = {} self._idlist = [] self.params = {} - self._globalid = NOTSET - self._globalparam = NOTSET self._arg2scopenum = {} # used for sorting parametrized resources self.marks = [] self.indices = {} @@ -803,8 +801,6 @@ class CallSpec2: cs.indices.update(self.indices) cs._arg2scopenum.update(self._arg2scopenum) cs._idlist = list(self._idlist) - cs._globalid = self._globalid - cs._globalparam = self._globalparam return cs def _checkargnotcontained(self, arg): @@ -815,9 +811,7 @@ class CallSpec2: try: return self.params[name] except KeyError: - if self._globalparam is NOTSET: - raise ValueError(name) - return self._globalparam + raise ValueError(name) @property def id(self):