Merge pull request #19 from carljm/fix-pytest-deprecation-warning

Fix deprecation warning for use of pluginmanager.addhooks method.
pytest-dev · Feb 4, 2016 · 71bb450 · 71bb450
2 parents be69565 + 0cd087d
commit 71bb450
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pytest_factoryboy/plugin.py b/pytest_factoryboy/plugin.py
@@ -58,4 +58,6 @@ def pytest_runtest_call(item):
 def pytest_addhooks(pluginmanager):
     """Register plugin hooks."""
     from pytest_factoryboy import hooks
-    pluginmanager.addhooks(hooks)
+    # addhooks is for older py.test and deprecated; replaced by add_hookspecs
+    add_hookspecs = getattr(pluginmanager, 'add_hookspecs', pluginmanager.addhooks)
+    add_hookspecs(hooks)