From 216919d61296c7dde2ad41f75177411252dbe000 Mon Sep 17 00:00:00 2001
From: hpk <none@none>
Date: Sun, 28 Jan 2007 21:37:30 +0100
Subject: [PATCH] [svn r37501] rename for clarity

--HG--
branch : trunk
---
 py/test/config.py                      | 2 +-
 py/test/conftesthandle.py              | 2 +-
 py/test/testing/test_conftesthandle.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/py/test/config.py b/py/test/config.py
index c8a68c123..daa084e48 100644
--- a/py/test/config.py
+++ b/py/test/config.py
@@ -122,7 +122,7 @@ class Config(object):
         """ same as previous, but returns conftest's path
         as well
         """
-        val, mod = self.conftest.rget_path(name, path)
+        val, mod = self.conftest.rget_with_confmod(name, path)
         return val, py.path.local(mod.__file__).dirpath()
 
     def initsession(self):
diff --git a/py/test/conftesthandle.py b/py/test/conftesthandle.py
index e9c58dcf5..9602d9713 100644
--- a/py/test/conftesthandle.py
+++ b/py/test/conftesthandle.py
@@ -64,7 +64,7 @@ class Conftest(object):
         modules.reverse()
         return self._get(name, modules)
 
-    def rget_path(self, name, path=None):
+    def rget_with_confmod(self, name, path=None):
         return self._rget(name, path)
 
     def _get(self, name, modules):
diff --git a/py/test/testing/test_conftesthandle.py b/py/test/testing/test_conftesthandle.py
index 5a2dd6385..713af0646 100644
--- a/py/test/testing/test_conftesthandle.py
+++ b/py/test/testing/test_conftesthandle.py
@@ -68,7 +68,7 @@ class TestConftestValueAccessGlobal:
     def test_value_access_path(self):
         topdir = self.basedir.join("adir", "b")
         conftest = Conftest(topdir)
-        _, mod = conftest.rget_path("a")
+        _, mod = conftest.rget_with_confmod("a")
         assert py.path.local(mod.__file__).dirpath() == topdir
 
 class TestConftestValueAccessInPackage(TestConftestValueAccessGlobal):