From 2a579217b8a82d548432c8995200e0773d7eba2e Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Date: Sat, 16 Oct 2010 02:00:05 +0200
Subject: [PATCH] alias function keywords to funcarg request keywords

--HG--
branch : trunk
---
 pytest/plugin/python.py       | 1 +
 testing/plugin/test_python.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pytest/plugin/python.py b/pytest/plugin/python.py
index 8e73b27a0..20ed391d3 100644
--- a/pytest/plugin/python.py
+++ b/pytest/plugin/python.py
@@ -536,6 +536,7 @@ class FuncargRequest:
     def __init__(self, pyfuncitem):
         self._pyfuncitem = pyfuncitem
         self.function = pyfuncitem.obj
+        self.keywords = pyfuncitem.keywords
         self.module = pyfuncitem.getparent(pytest.collect.Module).obj
         clscol = pyfuncitem.getparent(pytest.collect.Class)
         self.cls = clscol and clscol.obj or None
diff --git a/testing/plugin/test_python.py b/testing/plugin/test_python.py
index 7f52678e9..069e41d62 100644
--- a/testing/plugin/test_python.py
+++ b/testing/plugin/test_python.py
@@ -562,6 +562,7 @@ class TestRequest:
         """)
         req = funcargs.FuncargRequest(item)
         assert req.function == item.obj
+        assert req.keywords is item.keywords
         assert hasattr(req.module, 'test_func')
         assert req.cls is None
         assert req.function.__name__ == "test_func"