Merge remote-tracking branch 'upstream/master' into param-ids-fix

_pytest/python.py

@@ -49,6 +49,13 @@ def _has_positional_arg(func):
 
 
 def filter_traceback(entry):
+    # entry.path might sometimes return a str() object when the entry
+    # points to dynamically generated code
+    # see https://bitbucket.org/pytest-dev/py/issues/71
+    raw_filename = entry.frame.code.raw.co_filename
+    is_generated = '<' in raw_filename and '>' in raw_filename
+    if is_generated:
+        return False
     return entry.path != cutdir1 and not entry.path.relto(cutdir2)