[py-svn] r10682 - in py/branch/py-collect: . execnet thread/testing
hpk at codespeak.net
hpk at codespeak.net
Fri Apr 15 17:41:39 CEST 2005
Author: hpk
Date: Fri Apr 15 17:41:39 2005
New Revision: 10682
Modified:
py/branch/py-collect/__init__.py
py/branch/py-collect/execnet/gateway.py
py/branch/py-collect/thread/testing/test_io.py
py/branch/py-collect/thread/testing/test_pool.py
Log:
moved py.thread to py._thread to indicate that
you can rely on its API on your own risk.
Modified: py/branch/py-collect/__init__.py
==============================================================================
--- py/branch/py-collect/__init__.py (original)
+++ py/branch/py-collect/__init__.py Fri Apr 15 17:41:39 2005
@@ -1,22 +1,22 @@
from initpkg import initpkg
initpkg(__name__, exportdefs = {
- # helpers for use from test functions or collectors
+ # helpers for use from test functions or collectors
'test.raises' : ('./test/raises.py', 'raises'),
'test.skip' : ('./test/item.py', 'skip'),
'test.fail' : ('./test/item.py', 'fail'),
'test.exit' : ('./test/session.py', 'exit'),
'test.skip_on_error' : ('./test/item.py', 'skip_on_error'),
- 'test.compat.TestCase' : ('./test/compat.py', 'TestCase'),
+ 'test.compat.TestCase' : ('./test/compat.py', 'TestCase'),
- # configuration/initialization related test api
- 'test.Config' : ('./test/config.py', 'Config'),
- 'test.ensuretemp' : ('./test/config.py', 'ensuretemp'),
+ # configuration/initialization related test api
+ 'test.Config' : ('./test/config.py', 'Config'),
+ 'test.ensuretemp' : ('./test/config.py', 'ensuretemp'),
- # for customization of collecting/running tests
+ # for customization of collecting/running tests
'test.Session' : ('./test/session.py', 'Session'),
- 'test.TerminalSession' : ('./test/terminal/terminal.py', 'TerminalSession'),
- 'test.TkinterSession' : ('./test/tkinter/tkgui.py', 'TkinterSession'),
+ 'test.TerminalSession' : ('./test/terminal/terminal.py', 'TerminalSession'),
+ 'test.TkinterSession' : ('./test/tkinter/tkgui.py', 'TkinterSession'),
'test.collect.Collector' : ('./test/collect.py', 'Collector'),
'test.collect.Directory' : ('./test/collect.py', 'Directory'),
'test.collect.Module' : ('./test/collect.py', 'Module'),
@@ -26,25 +26,25 @@
'test.Item' : ('./test/item.py', 'Item'),
'test.Function' : ('./test/item.py', 'Function'),
- # thread related API
- 'thread.WorkerPool' : ('./thread/pool.py', 'WorkerPool'),
- 'thread.NamedThreadPool' : ('./thread/pool.py', 'NamedThreadPool'),
- 'thread.ThreadOut' : ('./thread/io.py', 'ThreadOut'),
+ # thread related API (still in early design phase)
+ '_thread.WorkerPool' : ('./thread/pool.py', 'WorkerPool'),
+ '_thread.NamedThreadPool' : ('./thread/pool.py', 'NamedThreadPool'),
+ '_thread.ThreadOut' : ('./thread/io.py', 'ThreadOut'),
- # hook into the top-level standard library
+ # hook into the top-level standard library
'std' : ('./misc/std.py', 'std'),
'process.cmdexec' : ('./process/cmdexec.py', 'cmdexec'),
- # path implementations
+ # path implementations
'path.svnwc' : ('./path/svn/wccommand.py', 'SvnWCCommandPath'),
'path.svnurl' : ('./path/svn/urlcommand.py', 'SvnCommandPath'),
'path.local' : ('./path/local/local.py', 'LocalPath'),
'path.extpy' : ('./path/extpy/extpy.py', 'Extpy'),
'path.checker' : ('./path/common.py', 'checker'),
- # some nice more or less magic APIs
- 'magic.greenlet' : ('./magic/greenlet.py', 'greenlet'),
+ # some nice more or less magic APIs
+ 'magic.greenlet' : ('./magic/greenlet.py', 'greenlet'),
'magic.invoke' : ('./magic/invoke.py', 'invoke'),
'magic.revoke' : ('./magic/invoke.py', 'revoke'),
'magic.patch' : ('./magic/patch.py', 'patch'),
@@ -53,7 +53,7 @@
'magic.View' : ('./magic/viewtype.py', 'View'),
'magic.AssertionError' : ('./magic/assertion.py', 'AssertionError'),
- # generalized inspection API
+ # generalized inspection API
'code.compile' : ('./code/source.py', 'compile_'),
'code.Source' : ('./code/source.py', 'Source'),
'code.Code' : ('./code/frame.py', 'Code'),
@@ -61,20 +61,20 @@
'code.ExceptionInfo' : ('./code/excinfo.py', 'ExceptionInfo'),
'code.Traceback' : ('./code/traceback2.py', 'Traceback'),
- # backports and additions of builtins
+ # backports and additions of builtins
'builtin.enumerate' : ('./builtin/enumerate.py', 'enumerate'),
- # gateways into remote contexts
+ # gateways into remote contexts
'execnet.SocketGateway' : ('./execnet/register.py', 'SocketGateway'),
'execnet.PopenGateway' : ('./execnet/register.py', 'PopenGateway'),
'execnet.SshGateway' : ('./execnet/register.py', 'SshGateway'),
- # error module, defining all errno's as Classes
+ # error module, defining all errno's as Classes
'error' : ('./misc/error.py', 'error'),
- # small and mean xml/html generation
- 'xml.html' : ('./xmlobj/html.py', 'html'),
- 'xml.Tag' : ('./xmlobj/xml.py', 'Tag'),
- 'xml.Namespace' : ('./xmlobj/xml.py', 'Namespace'),
- 'xml.escape' : ('./xmlobj/misc.py', 'escape'),
+ # small and mean xml/html generation
+ 'xml.html' : ('./xmlobj/html.py', 'html'),
+ 'xml.Tag' : ('./xmlobj/xml.py', 'Tag'),
+ 'xml.Namespace' : ('./xmlobj/xml.py', 'Namespace'),
+ 'xml.escape' : ('./xmlobj/misc.py', 'escape'),
})
Modified: py/branch/py-collect/execnet/gateway.py
==============================================================================
--- py/branch/py-collect/execnet/gateway.py (original)
+++ py/branch/py-collect/execnet/gateway.py Fri Apr 15 17:41:39 2005
@@ -13,9 +13,9 @@
from py.code import Source
from py.__impl__.execnet.channel import ChannelFactory, Channel
from py.__impl__.execnet.message import Message
- ThreadOut = py.thread.ThreadOut
- WorkerPool = py.thread.WorkerPool
- NamedThreadPool = py.thread.NamedThreadPool
+ ThreadOut = py._thread.ThreadOut
+ WorkerPool = py._thread.WorkerPool
+ NamedThreadPool = py._thread.NamedThreadPool
assert Message and ChannelFactory, "Import/Configuration Error"
Modified: py/branch/py-collect/thread/testing/test_io.py
==============================================================================
--- py/branch/py-collect/thread/testing/test_io.py (original)
+++ py/branch/py-collect/thread/testing/test_io.py Fri Apr 15 17:41:39 2005
@@ -2,8 +2,8 @@
import py
import sys
-WorkerPool = py.thread.WorkerPool
-ThreadOut = py.thread.ThreadOut
+WorkerPool = py._thread.WorkerPool
+ThreadOut = py._thread.ThreadOut
def test_threadout_install_deinstall():
old = sys.stdout
Modified: py/branch/py-collect/thread/testing/test_pool.py
==============================================================================
--- py/branch/py-collect/thread/testing/test_pool.py (original)
+++ py/branch/py-collect/thread/testing/test_pool.py Fri Apr 15 17:41:39 2005
@@ -2,8 +2,8 @@
import py
import sys
-WorkerPool = py.thread.WorkerPool
-ThreadOut = py.thread.ThreadOut
+WorkerPool = py._thread.WorkerPool
+ThreadOut = py._thread.ThreadOut
def test_some():
pool = WorkerPool()
More information about the pytest-commit
mailing list