From eb462582afa3ca83b2c278bc52fc4094e65f6553 Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Thu, 10 Aug 2017 09:05:22 +0200
Subject: [PATCH] fix #2675 - store marks correctly in callspecs

---
 _pytest/mark.py            |  4 ----
 _pytest/python.py          | 22 ++++++++++++++--------
 changelog/2672.removal     |  2 ++
 changelog/2675.removal     |  1 +
 testing/python/metafunc.py |  2 +-
 5 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 changelog/2672.removal
 create mode 100644 changelog/2675.removal

diff --git a/_pytest/mark.py b/_pytest/mark.py
index 74473a9d78a..f76d7da3b0a 100644
--- a/_pytest/mark.py
+++ b/_pytest/mark.py
@@ -67,10 +67,6 @@ def extract_from(cls, parameterset, legacy_force_tuple=False):
 
         return cls(argval, marks=newmarks, id=None)
 
-    @property
-    def deprecated_arg_dict(self):
-        return dict((mark.name, mark) for mark in self.marks)
-
 
 class MarkerError(Exception):
 
diff --git a/_pytest/python.py b/_pytest/python.py
index bdf14d84164..b794862671f 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -645,14 +645,14 @@ def __init__(self, metafunc):
         self._globalid_args = set()
         self._globalparam = NOTSET
         self._arg2scopenum = {}  # used for sorting parametrized resources
-        self.keywords = {}
+        self.marks = []
         self.indices = {}
 
     def copy(self, metafunc):
         cs = CallSpec2(self.metafunc)
         cs.funcargs.update(self.funcargs)
         cs.params.update(self.params)
-        cs.keywords.update(self.keywords)
+        cs.marks.extend(self.marks)
         cs.indices.update(self.indices)
         cs._arg2scopenum.update(self._arg2scopenum)
         cs._idlist = list(self._idlist)
@@ -677,8 +677,8 @@ def getparam(self, name):
     def id(self):
         return "-".join(map(str, filter(None, self._idlist)))
 
-    def setmulti(self, valtypes, argnames, valset, id, keywords, scopenum,
-                 param_index):
+    def setmulti2(self, valtypes, argnames, valset, id, marks, scopenum,
+                  param_index):
         for arg, val in zip(argnames, valset):
             self._checkargnotcontained(arg)
             valtype_for_arg = valtypes[arg]
@@ -686,7 +686,7 @@ def setmulti(self, valtypes, argnames, valset, id, keywords, scopenum,
             self.indices[arg] = param_index
             self._arg2scopenum[arg] = scopenum
         self._idlist.append(id)
-        self.keywords.update(keywords)
+        self.marks.extend(marks)
 
     def setall(self, funcargs, id, param):
         for x in funcargs:
@@ -842,8 +842,8 @@ def parametrize(self, argnames, argvalues, indirect=False, ids=None,
                         'equal to the number of names ({1})'.format(
                             param.values, argnames))
                 newcallspec = callspec.copy(self)
-                newcallspec.setmulti(valtypes, argnames, param.values, a_id,
-                                     param.deprecated_arg_dict, scopenum, param_index)
+                newcallspec.setmulti2(valtypes, argnames, param.values, a_id,
+                                      param.marks, scopenum, param_index)
                 newcalls.append(newcallspec)
         self._calls = newcalls
 
@@ -1115,7 +1115,13 @@ def __init__(self, name, parent, args=None, config=None,
         self.keywords.update(self.obj.__dict__)
         if callspec:
             self.callspec = callspec
-            self.keywords.update(callspec.keywords)
+            # this is total hostile and a mess
+            # keywords are broken by design by now
+            # this will be redeemed later
+            for mark in callspec.marks:
+                # feel free to cry, this was broken for years before
+                # and keywords cant fix it per design
+                self.keywords[mark.name] = mark
         if keywords:
             self.keywords.update(keywords)
 
diff --git a/changelog/2672.removal b/changelog/2672.removal
new file mode 100644
index 00000000000..e660c27fd85
--- /dev/null
+++ b/changelog/2672.removal
@@ -0,0 +1,2 @@
+Internally change ``CallSpec2`` to have a list of marks instead of a broken mapping of keywords.
+This removes the keywords attribute of the internal ``CallSpec2`` class.
\ No newline at end of file
diff --git a/changelog/2675.removal b/changelog/2675.removal
new file mode 100644
index 00000000000..44f597892fc
--- /dev/null
+++ b/changelog/2675.removal
@@ -0,0 +1 @@
+remove ParameterSet.deprecated_arg_dict - its not a public api and the lack of the underscore was a naming error.
\ No newline at end of file
diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py
index a0025a15a98..cf3bea7bed7 100644
--- a/testing/python/metafunc.py
+++ b/testing/python/metafunc.py
@@ -158,7 +158,7 @@ def func(y):
             pass
         metafunc = self.Metafunc(func)
         metafunc.parametrize("y", [])
-        assert 'skip' in metafunc._calls[0].keywords
+        assert 'skip' == metafunc._calls[0].marks[0].name
 
     def test_parametrize_with_userobjects(self):
         def func(x, y):