From d2f11081cb6c1b49cbd0fe6cc6774195bd07aaed Mon Sep 17 00:00:00 2001
From: guido <none@none>
Date: Fri, 9 Feb 2007 00:43:27 +0100
Subject: [PATCH] [svn r38221] Reverting previous changes after a discussion
 with hpk.

--HG--
branch : trunk
---
 py/conftest.py                     | 11 +++++++++++
 py/execnet/conftest.py             | 10 ----------
 py/execnet/testing/test_gateway.py |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 py/execnet/conftest.py

diff --git a/py/conftest.py b/py/conftest.py
index 601606c7e..229b0793e 100644
--- a/py/conftest.py
+++ b/py/conftest.py
@@ -15,4 +15,15 @@ exitfirst = False
 fulltrace = False
 showlocals = False
 nomagic = False
+
+import py
+Option = py.test.config.Option
+
+option = py.test.config.addoptions("execnet options",
+        Option('-S', '',
+               action="store", dest="sshtarget", default=None,
+               help=("target to run tests requiring ssh, e.g. "
+                     "user@codespeak.net")),
+    )
+
 dist_rsync_roots = ['.']
diff --git a/py/execnet/conftest.py b/py/execnet/conftest.py
deleted file mode 100644
index 9ceddb7e3..000000000
--- a/py/execnet/conftest.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import py
-Option = py.test.config.Option
-
-option = py.test.config.addoptions("execnet options",
-        Option('-S', '',
-               action="store", dest="sshtarget", default=None,
-               help=("target to run tests requiring ssh, e.g. "
-                     "user@codespeak.net")),
-    )
-
diff --git a/py/execnet/testing/test_gateway.py b/py/execnet/testing/test_gateway.py
index 1031ea0d3..854d613b7 100644
--- a/py/execnet/testing/test_gateway.py
+++ b/py/execnet/testing/test_gateway.py
@@ -2,7 +2,7 @@ from __future__ import generators
 import os, sys, time, signal
 import py
 from py.__.execnet import gateway
-from py.__.execnet.conftest import option 
+from py.__.conftest import option 
 mypath = py.magic.autopath()
 
 from StringIO import StringIO