Merged hpk42/pytest into default

CHANGELOG

@@ -20,6 +20,8 @@ Changes between 2.3.5 and 2.4.DEV
 
 - honor --tb style for setup/teardown errors as well.  Thanks Maho.
 
+- fix issue307 - use yaml.safe_load in example, thanks Mark Eichin.
+
 Changes between 2.3.4 and 2.3.5
 -----------------------------------
 

doc/en/example/nonpython/conftest.py

@@ -9,7 +9,7 @@ def pytest_collect_file(parent, path):
 class YamlFile(pytest.File):
     def collect(self):
         import yaml # we need a yaml parser, e.g. PyYAML
-        raw = yaml.load(self.fspath.open())
+        raw = yaml.safe_load(self.fspath.open())
         for name, spec in raw.items():
             yield YamlItem(name, self, spec)