Fixed transform_marks_into_decorators for python 2 + pytest 2

Author: Sylvain MARIE

pytest_cases/common.py

@@ -200,22 +200,26 @@ def transform_marks_into_decorators(marks):
     try:
         for m in marks:
             md = pytest.mark.MarkDecorator()
-            if isinstance(m, type(md)):
-                # already a decorator, we can use it
-                marks_mod.append(m)
-            else:
-                if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
-                     md.mark = m
+
+            if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
+                if isinstance(m, type(md)):
+                    # already a decorator, we can use it
+                    marks_mod.append(m)
                 else:
-                    md.name = m.name
-                    # md.markname = m.name
-                    md.args = m.args
-                    md.kwargs = m.kwargs
+                    md.mark = m
+                    marks_mod.append(md)
+            else:
+                # always recreate one, type comparison does not work (all generic stuff)
+                md.name = m.name
+                # md.markname = m.name
+                md.args = m.args
+                md.kwargs = m.kwargs
 
                 # markinfodecorator = getattr(pytest.mark, markinfo.name)
                 # markinfodecorator(*markinfo.args)
 
                 marks_mod.append(md)
+
     except Exception as e:
         warn("Caught exception while trying to mark case: [%s] %s" % (type(e), e))
     return marks_mod