From d1008d3752540b5e0c01c05521157b92e7d83864 Mon Sep 17 00:00:00 2001
From: hpk <none@none>
Date: Mon, 12 Feb 2007 13:21:16 +0100
Subject: [PATCH] [svn r38549] also privatizing Config.initdirect (which
 relates to remote reprs and such)

--HG--
branch : trunk
---
 py/test/config.py              | 2 +-
 py/test/rsession/slave.py      | 2 +-
 py/test/terminal/remote.py     | 2 +-
 py/test/testing/test_config.py | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/py/test/config.py b/py/test/config.py
index 453eea628..ddd88fdcc 100644
--- a/py/test/config.py
+++ b/py/test/config.py
@@ -52,7 +52,7 @@ class Config(object):
         self.topdir = gettopdir(args)
         self.args = args 
 
-    def initdirect(self, topdir, repr, coltrails=None):
+    def _initdirect(self, topdir, repr, coltrails=None):
         assert not self._initialized
         self._initialized = True
         self.topdir = py.path.local(topdir)
diff --git a/py/test/rsession/slave.py b/py/test/rsession/slave.py
index 2e4fc2790..85bf2c138 100644
--- a/py/test/rsession/slave.py
+++ b/py/test/rsession/slave.py
@@ -90,7 +90,7 @@ def setup():
     import py
     config = py.test.config
     assert not config._initialized 
-    config.initdirect(basedir, config_repr)
+    config._initdirect(basedir, config_repr)
     if hasattr(os, 'nice'):
         nice_level = config.getvalue('dist_nicelevel')
         os.nice(nice_level) 
diff --git a/py/test/terminal/remote.py b/py/test/terminal/remote.py
index 44f6b3067..b6ad2868a 100644
--- a/py/test/terminal/remote.py
+++ b/py/test/terminal/remote.py
@@ -124,7 +124,7 @@ def slaverun_TerminalSession(channel):
     topdir, repr, failures = channel.receive()
     print "SLAVE: received configuration, using topdir:", topdir
     config = py.test.config 
-    config.initdirect(topdir, repr, failures)
+    config._initdirect(topdir, repr, failures)
     config.option.session = None
     config.option.looponfailing = False 
     config.option.usepdb = False 
diff --git a/py/test/testing/test_config.py b/py/test/testing/test_config.py
index 8ce32d8c8..409636376 100644
--- a/py/test/testing/test_config.py
+++ b/py/test/testing/test_config.py
@@ -123,7 +123,7 @@ def test_gettopdir_pypkg():
 
 
 def test_config_init_direct():
-    tmp = py.test.ensuretemp("initdirect")
+    tmp = py.test.ensuretemp("_initdirect")
     tmp.ensure("__init__.py")
     tmp.ensure("conftest.py").write("x=1 ; y=2")
     hello = tmp.ensure("test_hello.py")
@@ -131,13 +131,13 @@ def test_config_init_direct():
     repr = config._makerepr(conftestnames=['x', 'y'])
     config2 = py.test.config._reparse([tmp.dirpath()])
     config2._initialized = False # we have to do that from tests
-    config2.initdirect(topdir=tmp.dirpath(), repr=repr)
+    config2._initdirect(topdir=tmp.dirpath(), repr=repr)
     for col1, col2 in zip(config.getcolitems(), config2.getcolitems()):
         assert col1.fspath == col2.fspath
-    py.test.raises(AssertionError, "config2.initdirect(None, None)")
+    py.test.raises(AssertionError, "config2._initdirect(None, None)")
     from py.__.test.config import Config
     config3 = Config()
-    config3.initdirect(topdir=tmp.dirpath(), repr=repr,
+    config3._initdirect(topdir=tmp.dirpath(), repr=repr,
         coltrails=[(tmp.basename, (hello.basename,))])
     assert config3.getvalue('x') == 1
     assert config3.getvalue('y') == 2