[py-svn] r11444 - in py/dist/py: . bin code documentation execnet execnet/testing magic magic/testing misc/testing path/extpy path/extpy/testing path/gateway path/local path/local/popen5/testing path/local/testing path/svn path/svn/testing path/testing test test/terminal test/testing test/tkinter test/tkinter/testing test/tool test/tool/testing xmlobj
hpk at codespeak.net
hpk at codespeak.net
Tue Apr 26 11:22:20 CEST 2005
Author: hpk
Date: Tue Apr 26 11:22:20 2005
New Revision: 11444
Modified:
py/dist/py/__init__.py
py/dist/py/bin/py.test
py/dist/py/code/traceback2.py
py/dist/py/documentation/conftest.py
py/dist/py/execnet/channel.py
py/dist/py/execnet/gateway.py
py/dist/py/execnet/register.py
py/dist/py/execnet/testing/test_gateway.py
py/dist/py/initpkg.py
py/dist/py/magic/assertion.py
py/dist/py/magic/autopath.py
py/dist/py/magic/invoke.py
py/dist/py/magic/testing/test_exprinfo.py
py/dist/py/misc/testing/test_cache.py
py/dist/py/misc/testing/test_initpkg.py
py/dist/py/path/extpy/extpy.py
py/dist/py/path/extpy/testing/test_extpy.py
py/dist/py/path/gateway/remotepath.py
py/dist/py/path/local/local.py
py/dist/py/path/local/popen5/testing/test_subprocess.py
py/dist/py/path/local/testing/test_local.py
py/dist/py/path/svn/svncommon.py
py/dist/py/path/svn/testing/svntestbase.py
py/dist/py/path/svn/testing/test_urlcommand.py
py/dist/py/path/svn/testing/test_wccommand.py
py/dist/py/path/svn/urlcommand.py
py/dist/py/path/svn/wccommand.py
py/dist/py/path/testing/fscommon.py
py/dist/py/path/testing/test_api.py
py/dist/py/test/config.py
py/dist/py/test/session.py
py/dist/py/test/terminal/out.py
py/dist/py/test/terminal/remote.py
py/dist/py/test/terminal/terminal.py
py/dist/py/test/testing/test_collect.py
py/dist/py/test/testing/test_config.py
py/dist/py/test/testing/test_session.py
py/dist/py/test/tkinter/backend.py
py/dist/py/test/tkinter/guisession.py
py/dist/py/test/tkinter/testing/test_backend.py
py/dist/py/test/tkinter/testing/test_guisession.py
py/dist/py/test/tkinter/testing/test_repository.py
py/dist/py/test/tkinter/testing/test_util.py
py/dist/py/test/tkinter/tkgui.py
py/dist/py/test/tkinter/util.py
py/dist/py/test/tool/optparse.py
py/dist/py/test/tool/testing/test_outerrcapture.py
py/dist/py/xmlobj/html.py
py/dist/py/xmlobj/xml.py
Log:
great renaming:
__impl__ -> __
This change does not affect any use of the public py lib API
but disrupts every use of implementation level stuff.
You just need to rename '__impl__' to '__'.
Modified: py/dist/py/__init__.py
==============================================================================
--- py/dist/py/__init__.py (original)
+++ py/dist/py/__init__.py Tue Apr 26 11:22:20 2005
@@ -32,6 +32,7 @@
# configuration/initialization related test api
'test.Config' : ('./test/config.py', 'Config'),
'test.ensuretemp' : ('./test/config.py', 'ensuretemp'),
+ 'test.cmdline.main' : ('./test/cmdline.py', 'main'),
# for customization of collecting/running tests
'test.Session' : ('./test/session.py', 'Session'),
Modified: py/dist/py/bin/py.test
==============================================================================
--- py/dist/py/bin/py.test (original)
+++ py/dist/py/bin/py.test Tue Apr 26 11:22:20 2005
@@ -1,5 +1,4 @@
#!/usr/bin/env python
from _findpy import py
-from py.__impl__.test.cmdline import main
-main()
+py.test.cmdline.main()
Modified: py/dist/py/code/traceback2.py
==============================================================================
--- py/dist/py/code/traceback2.py (original)
+++ py/dist/py/code/traceback2.py Tue Apr 26 11:22:20 2005
@@ -26,7 +26,7 @@
"""Reinterpret the failing statement and returns a detailed information
about what operations are performed."""
if self.exprinfo is None:
- from py.__impl__.magic import exprinfo
+ from py.__.magic import exprinfo
source = str(self.statement).strip()
x = exprinfo.interpret(source, self.frame, should_fail=True)
if not isinstance(x, str):
Modified: py/dist/py/documentation/conftest.py
==============================================================================
--- py/dist/py/documentation/conftest.py (original)
+++ py/dist/py/documentation/conftest.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
from __future__ import generators
import py
-from py.__impl__.misc import rest
+from py.__.misc import rest
Option = py.test.Config.Option
option = py.test.Config.addoptions("documentation check options",
Modified: py/dist/py/execnet/channel.py
==============================================================================
--- py/dist/py/execnet/channel.py (original)
+++ py/dist/py/execnet/channel.py Tue Apr 26 11:22:20 2005
@@ -1,7 +1,7 @@
import threading
import Queue
if 'Message' not in globals():
- from py.__impl__.execnet.message import Message
+ from py.__.execnet.message import Message
class RemoteError(EOFError):
""" Contains an Exceptions from the other side. """
Modified: py/dist/py/execnet/gateway.py
==============================================================================
--- py/dist/py/execnet/gateway.py (original)
+++ py/dist/py/execnet/gateway.py Tue Apr 26 11:22:20 2005
@@ -19,8 +19,8 @@
if 'ThreadOut' not in globals():
import py
from py.code import Source
- from py.__impl__.execnet.channel import ChannelFactory, Channel
- from py.__impl__.execnet.message import Message
+ from py.__.execnet.channel import ChannelFactory, Channel
+ from py.__.execnet.message import Message
ThreadOut = py._thread.ThreadOut
WorkerPool = py._thread.WorkerPool
NamedThreadPool = py._thread.NamedThreadPool
Modified: py/dist/py/execnet/register.py
==============================================================================
--- py/dist/py/execnet/register.py (original)
+++ py/dist/py/execnet/register.py Tue Apr 26 11:22:20 2005
@@ -12,19 +12,19 @@
# in a sufficient version
startup_modules = [
- 'py.__impl__.thread.io',
- 'py.__impl__.thread.pool',
- 'py.__impl__.execnet.inputoutput',
- 'py.__impl__.execnet.gateway',
- 'py.__impl__.execnet.message',
- 'py.__impl__.execnet.channel',
+ 'py.__.thread.io',
+ 'py.__.thread.pool',
+ 'py.__.execnet.inputoutput',
+ 'py.__.execnet.gateway',
+ 'py.__.execnet.message',
+ 'py.__.execnet.channel',
]
def getsource(dottedname):
mod = __import__(dottedname, None, None, ['__doc__'])
return inspect.getsource(mod)
-from py.__impl__.execnet import inputoutput, gateway
+from py.__.execnet import inputoutput, gateway
class InstallableGateway(gateway.Gateway):
""" initialize gateways on both sides of a inputoutput object. """
Modified: py/dist/py/execnet/testing/test_gateway.py
==============================================================================
--- py/dist/py/execnet/testing/test_gateway.py (original)
+++ py/dist/py/execnet/testing/test_gateway.py Tue Apr 26 11:22:20 2005
@@ -1,11 +1,11 @@
import os, sys
import py
-from py.__impl__.execnet import gateway
-from py.__impl__.conftest import option
+from py.__.execnet import gateway
+from py.__.conftest import option
mypath = py.magic.autopath()
from StringIO import StringIO
-from py.__impl__.execnet.register import startup_modules, getsource
+from py.__.execnet.register import startup_modules, getsource
def test_getsource_import_modules():
for dottedname in startup_modules:
Modified: py/dist/py/initpkg.py
==============================================================================
--- py/dist/py/initpkg.py (original)
+++ py/dist/py/initpkg.py Tue Apr 26 11:22:20 2005
@@ -42,14 +42,14 @@
"unsupported reinitialization of %r" % pkgmodule
pkgmodule.__package__ = self
- # make available pkgname.__impl__
- implname = name + '.' + '__impl__'
+ # make available pkgname.__
+ implname = name + '.' + '__'
self.implmodule = ModuleType(implname)
self.implmodule.__name__ = implname
self.implmodule.__file__ = pkgmodule.__file__
self.implmodule.__path__ = [os.path.abspath(p)
for p in pkgmodule.__path__]
- pkgmodule.__impl__ = self.implmodule
+ pkgmodule.__ = self.implmodule
setmodule(implname, self.implmodule)
# inhibit further direct filesystem imports through the package module
del pkgmodule.__path__
Modified: py/dist/py/magic/assertion.py
==============================================================================
--- py/dist/py/magic/assertion.py (original)
+++ py/dist/py/magic/assertion.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
import __builtin__, sys
import py
-from py.__impl__.magic import exprinfo
+from py.__.magic import exprinfo
BuiltinAssertionError = __builtin__.AssertionError
Modified: py/dist/py/magic/autopath.py
==============================================================================
--- py/dist/py/magic/autopath.py (original)
+++ py/dist/py/magic/autopath.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
import os, sys
from py.path import local
-from py.__impl__.path.common import PathStr
+from py.__.path.common import PathStr
def autopath(globs=None, basefile='__init__.py'):
""" return the (local) path of the "current" file pointed to by globals
Modified: py/dist/py/magic/invoke.py
==============================================================================
--- py/dist/py/magic/invoke.py (original)
+++ py/dist/py/magic/invoke.py Tue Apr 26 11:22:20 2005
@@ -10,7 +10,7 @@
a useful error message.
"""
if assertion:
- from py.__impl__.magic import assertion
+ from py.__.magic import assertion
assertion.invoke()
if compile:
py.magic.patch(cpy_builtin, 'compile', py.code.compile )
@@ -18,7 +18,7 @@
def revoke(assertion=False, compile=False):
""" revoke previously invoked magic (see invoke())."""
if assertion:
- from py.__impl__.magic import assertion
+ from py.__.magic import assertion
assertion.revoke()
if compile:
py.magic.revert(cpy_builtin, 'compile')
Modified: py/dist/py/magic/testing/test_exprinfo.py
==============================================================================
--- py/dist/py/magic/testing/test_exprinfo.py (original)
+++ py/dist/py/magic/testing/test_exprinfo.py Tue Apr 26 11:22:20 2005
@@ -1,7 +1,7 @@
import sys
import py
-from py.__impl__.magic.exprinfo import getmsg, interpret
+from py.__.magic.exprinfo import getmsg, interpret
def getexcinfo(exc, obj, *args, **kwargs):
try:
Modified: py/dist/py/misc/testing/test_cache.py
==============================================================================
--- py/dist/py/misc/testing/test_cache.py (original)
+++ py/dist/py/misc/testing/test_cache.py Tue Apr 26 11:22:20 2005
@@ -1,5 +1,5 @@
import py
-from py.__impl__.misc.cache import BuildcostAccessCache, AgingCache
+from py.__.misc.cache import BuildcostAccessCache, AgingCache
class BasicCacheAPITest:
cache = None
Modified: py/dist/py/misc/testing/test_initpkg.py
==============================================================================
--- py/dist/py/misc/testing/test_initpkg.py (original)
+++ py/dist/py/misc/testing/test_initpkg.py Tue Apr 26 11:22:20 2005
@@ -11,7 +11,7 @@
assert getattr(obj, '__map__') == {}
def test_dir():
- from py.__impl__.initpkg import Module
+ from py.__.initpkg import Module
for name in dir(py):
if name == 'magic': # greenlets don't work everywhere, we don't care here
continue
@@ -47,7 +47,7 @@
base.join('c-extension',),
base.join('magic', 'greenlet.py'),
base.join('bin'),
- base.join('execnet', 'bin'),
+ base.join('execnet', 'script'),
)
for p in base.visit('*.py', py.path.checker(dotfile=0)):
relpath = p.new(ext='').relto(base)
@@ -57,7 +57,7 @@
break
else:
relpath = relpath.replace(base.sep, '.')
- modpath = 'py.__impl__.%s' % relpath
+ modpath = 'py.__.%s' % relpath
yield check_import, modpath
def check_import(modpath):
Modified: py/dist/py/path/extpy/extpy.py
==============================================================================
--- py/dist/py/path/extpy/extpy.py (original)
+++ py/dist/py/path/extpy/extpy.py Tue Apr 26 11:22:20 2005
@@ -6,7 +6,7 @@
"""
from __future__ import generators
import py
-from py.__impl__.path import common
+from py.__.path import common
import sys
import inspect
moduletype = type(py)
Modified: py/dist/py/path/extpy/testing/test_extpy.py
==============================================================================
--- py/dist/py/path/extpy/testing/test_extpy.py (original)
+++ py/dist/py/path/extpy/testing/test_extpy.py Tue Apr 26 11:22:20 2005
@@ -1,7 +1,7 @@
import os
import py
-from py.__impl__.path.testing import common
+from py.__.path.testing import common
mypath = py.magic.autopath().dirpath('inc_test_extpy.py')
Modified: py/dist/py/path/gateway/remotepath.py
==============================================================================
--- py/dist/py/path/gateway/remotepath.py (original)
+++ py/dist/py/path/gateway/remotepath.py Tue Apr 26 11:22:20 2005
@@ -1,5 +1,5 @@
import py, itertools
-from py.__impl__.path import common
+from py.__.path import common
COUNTER = itertools.count()
Modified: py/dist/py/path/local/local.py
==============================================================================
--- py/dist/py/path/local/local.py (original)
+++ py/dist/py/path/local/local.py Tue Apr 26 11:22:20 2005
@@ -8,12 +8,12 @@
from __future__ import generators
import sys, os, stat
import py
-from py.__impl__.path import common
+from py.__.path import common
if sys.platform == 'win32':
- from py.__impl__.path.local.win import WinMixin as PlatformMixin
+ from py.__.path.local.win import WinMixin as PlatformMixin
else:
- from py.__impl__.path.local.posix import PosixMixin as PlatformMixin
+ from py.__.path.local.posix import PosixMixin as PlatformMixin
class LocalPath(common.FSPathBase, PlatformMixin):
""" Local path implementation offering access/modification
@@ -396,7 +396,7 @@
def getpymodule(self):
if self.ext != '.c':
return super(LocalPath, self).getpymodule()
- from py.__impl__.misc.buildcmodule import make_module_from_c
+ from py.__.misc.buildcmodule import make_module_from_c
mod = make_module_from_c(self)
return mod
@@ -452,7 +452,7 @@
to be executed. Note that this process is directly
invoked and not through a system shell.
"""
- from py.__impl__.path.local.popen5.subprocess import Popen, PIPE
+ from py.__.path.local.popen5.subprocess import Popen, PIPE
argv = map(str, argv)
proc = Popen([str(self)] + list(argv), stdout=PIPE, stderr=PIPE)
stdout, stderr = proc.communicate()
Modified: py/dist/py/path/local/popen5/testing/test_subprocess.py
==============================================================================
--- py/dist/py/path/local/popen5/testing/test_subprocess.py (original)
+++ py/dist/py/path/local/popen5/testing/test_subprocess.py Tue Apr 26 11:22:20 2005
@@ -1,7 +1,7 @@
import sys
import os
import py
-from py.__impl__.path.local.popen5 import subprocess
+from py.__.path.local.popen5 import subprocess
mswindows = (sys.platform == "win32")
Modified: py/dist/py/path/local/testing/test_local.py
==============================================================================
--- py/dist/py/path/local/testing/test_local.py (original)
+++ py/dist/py/path/local/testing/test_local.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
import py
from py.path import local, checker
-from py.__impl__.path.testing.fscommon import CommonFSTests, setuptestfs
+from py.__.path.testing.fscommon import CommonFSTests, setuptestfs
class LocalSetup:
def setup_class(cls):
Modified: py/dist/py/path/svn/svncommon.py
==============================================================================
--- py/dist/py/path/svn/svncommon.py (original)
+++ py/dist/py/path/svn/svncommon.py Tue Apr 26 11:22:20 2005
@@ -3,7 +3,7 @@
"""
import os, sys, time, re
import py
-from py.__impl__.path import common
+from py.__.path import common
#_______________________________________________________________
Modified: py/dist/py/path/svn/testing/svntestbase.py
==============================================================================
--- py/dist/py/path/svn/testing/svntestbase.py (original)
+++ py/dist/py/path/svn/testing/svntestbase.py Tue Apr 26 11:22:20 2005
@@ -1,7 +1,7 @@
import py
from py import path, test, process
-from py.__impl__.path.testing.fscommon import CommonFSTests, setuptestfs
-from py.__impl__.path.svn import cache
+from py.__.path.testing.fscommon import CommonFSTests, setuptestfs
+from py.__.path.svn import cache
mypath = py.magic.autopath()
repodump = mypath.dirpath('repotest.dump')
Modified: py/dist/py/path/svn/testing/test_urlcommand.py
==============================================================================
--- py/dist/py/path/svn/testing/test_urlcommand.py (original)
+++ py/dist/py/path/svn/testing/test_urlcommand.py Tue Apr 26 11:22:20 2005
@@ -1,5 +1,5 @@
import py
-from py.__impl__.path.svn.testing.svntestbase import CommonCommandAndBindingTests, getrepowc
+from py.__.path.svn.testing.svntestbase import CommonCommandAndBindingTests, getrepowc
class TestSvnCommandPath(CommonCommandAndBindingTests):
def setup_class(cls):
Modified: py/dist/py/path/svn/testing/test_wccommand.py
==============================================================================
--- py/dist/py/path/svn/testing/test_wccommand.py (original)
+++ py/dist/py/path/svn/testing/test_wccommand.py Tue Apr 26 11:22:20 2005
@@ -1,5 +1,5 @@
import py
-from py.__impl__.path.svn.testing.svntestbase import CommonSvnTests, getrepowc
+from py.__.path.svn.testing.svntestbase import CommonSvnTests, getrepowc
class TestWCSvnCommandPath(CommonSvnTests):
Modified: py/dist/py/path/svn/urlcommand.py
==============================================================================
--- py/dist/py/path/svn/urlcommand.py (original)
+++ py/dist/py/path/svn/urlcommand.py Tue Apr 26 11:22:20 2005
@@ -8,9 +8,9 @@
import os, sys, time, re
import py
from py import path, process
-from py.__impl__.path import common
-from py.__impl__.path.svn import svncommon
-from py.__impl__.misc.cache import BuildcostAccessCache, AgingCache
+from py.__.path import common
+from py.__.path.svn import svncommon
+from py.__.misc.cache import BuildcostAccessCache, AgingCache
class SvnCommandPath(svncommon.SvnPathBase):
_lsrevcache = BuildcostAccessCache(maxentries=128)
Modified: py/dist/py/path/svn/wccommand.py
==============================================================================
--- py/dist/py/path/svn/wccommand.py (original)
+++ py/dist/py/path/svn/wccommand.py Tue Apr 26 11:22:20 2005
@@ -10,9 +10,9 @@
import os, sys, time, re
import py
-from py.__impl__.path import common
-from py.__impl__.path.svn import cache
-from py.__impl__.path.svn import svncommon
+from py.__.path import common
+from py.__.path.svn import cache
+from py.__.path.svn import svncommon
DEBUG = 0
@@ -378,7 +378,7 @@
return True
def log(self, rev_start=None, rev_end=1, verbose=False):
- from py.__impl__.path.svn.command import _Head, LogEntry
+ from py.__.path.svn.command import _Head, LogEntry
assert self.check() # make it simpler for the pipe
rev_start = rev_start is None and _Head or rev_start
rev_end = rev_end is None and _Head or rev_end
Modified: py/dist/py/path/testing/fscommon.py
==============================================================================
--- py/dist/py/path/testing/fscommon.py (original)
+++ py/dist/py/path/testing/fscommon.py Tue Apr 26 11:22:20 2005
@@ -1,5 +1,5 @@
import py
-from py.__impl__.path.testing import common
+from py.__.path.testing import common
checker = py.path.checker
Modified: py/dist/py/path/testing/test_api.py
==============================================================================
--- py/dist/py/path/testing/test_api.py (original)
+++ py/dist/py/path/testing/test_api.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
from py import path, test
import py
-from py.__impl__.path.svn.testing.test_wccommand import getrepowc
+from py.__.path.svn.testing.test_wccommand import getrepowc
class TestAPI:
Modified: py/dist/py/test/config.py
==============================================================================
--- py/dist/py/test/config.py (original)
+++ py/dist/py/test/config.py Tue Apr 26 11:22:20 2005
@@ -1,7 +1,7 @@
from __future__ import generators
import py
-from py.__impl__.test.tool import optparse
+from py.__.test.tool import optparse
defaultconfig = py.magic.autopath().dirpath('defaultconftest.py')
dummy = object()
Modified: py/dist/py/test/session.py
==============================================================================
--- py/dist/py/test/session.py (original)
+++ py/dist/py/test/session.py Tue Apr 26 11:22:20 2005
@@ -1,5 +1,5 @@
import py
-from py.__impl__.test.tool.outerrcapture import SimpleOutErrCapture
+from py.__.test.tool.outerrcapture import SimpleOutErrCapture
class Session(object):
"""
@@ -115,7 +115,7 @@
def _map2colitems(items):
# first convert all path objects into collectors
- from py.__impl__.test.collect import getfscollector
+ from py.__.test.collect import getfscollector
colitems = []
for item in items:
if isinstance(item, (list, tuple)):
Modified: py/dist/py/test/terminal/out.py
==============================================================================
--- py/dist/py/test/terminal/out.py (original)
+++ py/dist/py/test/terminal/out.py Tue Apr 26 11:22:20 2005
@@ -3,7 +3,7 @@
import os
import py
-from py.__impl__.execnet.channel import Channel
+from py.__.execnet.channel import Channel
class Out(object):
tty = False
Modified: py/dist/py/test/terminal/remote.py
==============================================================================
--- py/dist/py/test/terminal/remote.py (original)
+++ py/dist/py/test/terminal/remote.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
from __future__ import generators
import py
-from py.__impl__.test.terminal.out import getout
+from py.__.test.terminal.out import getout
import sys
def checkpyfilechange(rootdir, statcache={}):
@@ -91,7 +91,7 @@
def failure_master(executable, out, args, failures):
gw = py.execnet.PopenGateway(executable)
channel = gw.remote_exec("""
- from py.__impl__.test.terminal.remote import failure_slave
+ from py.__.test.terminal.remote import failure_slave
failure_slave(channel)
""", stdout=out, stderr=out)
channel.send((args, failures))
Modified: py/dist/py/test/terminal/terminal.py
==============================================================================
--- py/dist/py/test/terminal/terminal.py (original)
+++ py/dist/py/test/terminal/terminal.py Tue Apr 26 11:22:20 2005
@@ -2,7 +2,7 @@
from time import time as now
Item = py.test.Item
-from py.__impl__.test.terminal.out import getout
+from py.__.test.terminal.out import getout
class TerminalSession(py.test.Session):
def __init__(self, config, file=None):
@@ -16,7 +16,7 @@
def main(self, args):
if self.config.option._remote:
- from py.__impl__.test.terminal import remote
+ from py.__.test.terminal import remote
return remote.main(self.config, self._file, self.config._origargs)
else:
return super(TerminalSession, self).main(args)
Modified: py/dist/py/test/testing/test_collect.py
==============================================================================
--- py/dist/py/test/testing/test_collect.py (original)
+++ py/dist/py/test/testing/test_collect.py Tue Apr 26 11:22:20 2005
@@ -182,7 +182,7 @@
assert 23 == 23
""")
- from py.__impl__.test.collect import getfscollector
+ from py.__.test.collect import getfscollector
for x in (o, checkfile, checkfile.dirpath()):
#print "checking that %s returns custom items" % (x,)
col = getfscollector(x)
Modified: py/dist/py/test/testing/test_config.py
==============================================================================
--- py/dist/py/test/testing/test_config.py (original)
+++ py/dist/py/test/testing/test_config.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
from __future__ import generators
import py
-from py.__impl__.test import config
+from py.__.test import config
class MyClass:
def getoptions(self):
@@ -46,7 +46,7 @@
old.chdir()
#def test_config_order():
-# from py.__impl__.test import config
+# from py.__.test import config
# o = py.test.ensuretemp('configorder')
# o.ensure('conftest.py').write('x=1 ; import py ; py._x = [x]')
# o.ensure('a/conftest.py').write('x=2 ; import py ; py._x.append(x)')
@@ -62,7 +62,7 @@
# assert py._x == [1,2,3]
#
#def test_getconfigvalue():
-# from py.__impl__.test import config
+# from py.__.test import config
# cfg = config.Config()
# o = py.test.ensuretemp('configtest')
# o.ensure('conftest.py').write('x=1')
Modified: py/dist/py/test/testing/test_session.py
==============================================================================
--- py/dist/py/test/testing/test_session.py (original)
+++ py/dist/py/test/testing/test_session.py Tue Apr 26 11:22:20 2005
@@ -191,7 +191,7 @@
item, outcome = l[0]
assert str(outcome.excinfo).find('does_not_work') != -1
-from py.__impl__.test.terminal.remote import getrootdir
+from py.__.test.terminal.remote import getrootdir
class TestRemote:
def test_rootdir_is_package(self):
d = tmpdir.ensure('rootdirtest1', dir=1)
Modified: py/dist/py/test/tkinter/backend.py
==============================================================================
--- py/dist/py/test/tkinter/backend.py (original)
+++ py/dist/py/test/tkinter/backend.py Tue Apr 26 11:22:20 2005
@@ -120,7 +120,7 @@
self.channel = self.gateway.newchannel(receiver = self.queue.put)
self.gateway.remote_exec(channel = self.channel, source = '''
import py
- from py.__impl__.test.tkinter.backend import remote
+ from py.__.test.tkinter.backend import remote
args, tests = channel.receive()
remote(channel, tests = tests, args = args)
@@ -129,8 +129,8 @@
def remote(channel, tests = [], args = []):
import py
- from py.__impl__.test.tkinter.guisession import GuiSession
- from py.__impl__.test.terminal.remote import getfailureitems
+ from py.__.test.tkinter.guisession import GuiSession
+ from py.__.test.terminal.remote import getfailureitems
config, testfiles = py.test.Config.parse(args)
if tests:
Modified: py/dist/py/test/tkinter/guisession.py
==============================================================================
--- py/dist/py/test/tkinter/guisession.py (original)
+++ py/dist/py/test/tkinter/guisession.py Tue Apr 26 11:22:20 2005
@@ -1,7 +1,7 @@
'''GuiSession builds TestReport instances and sends them to tkgui.Manager'''
import py
from util import TestReport2 as TestReport
-from py.__impl__.test.session import Exit, SimpleOutErrCapture
+from py.__.test.session import Exit, SimpleOutErrCapture
class GuiSession(py.test.Session):
Modified: py/dist/py/test/tkinter/testing/test_backend.py
==============================================================================
--- py/dist/py/test/tkinter/testing/test_backend.py (original)
+++ py/dist/py/test/tkinter/testing/test_backend.py Tue Apr 26 11:22:20 2005
@@ -1,5 +1,5 @@
import py
-from py.__impl__.test.tkinter import backend
+from py.__.test.tkinter import backend
RepositoryBackend = backend.RepositoryBackend
TestRepository = backend.TestRepository
Modified: py/dist/py/test/tkinter/testing/test_guisession.py
==============================================================================
--- py/dist/py/test/tkinter/testing/test_guisession.py (original)
+++ py/dist/py/test/tkinter/testing/test_guisession.py Tue Apr 26 11:22:20 2005
@@ -1,7 +1,7 @@
import py
-from py.__impl__.test.tkinter import guisession
-from py.__impl__.test.tkinter.util import Status, TestReport, Null
+from py.__.test.tkinter import guisession
+from py.__.test.tkinter.util import Status, TestReport, Null
GuiSession = guisession.GuiSession
class TestGuiSession:
Modified: py/dist/py/test/tkinter/testing/test_repository.py
==============================================================================
--- py/dist/py/test/tkinter/testing/test_repository.py (original)
+++ py/dist/py/test/tkinter/testing/test_repository.py Tue Apr 26 11:22:20 2005
@@ -1,5 +1,5 @@
-from py.__impl__.test.tkinter.repository import Repository, OrderedDict, OrderedDictMemo
+from py.__.test.tkinter.repository import Repository, OrderedDict, OrderedDictMemo
import py
Item = py.test.Item
Modified: py/dist/py/test/tkinter/testing/test_util.py
==============================================================================
--- py/dist/py/test/tkinter/testing/test_util.py (original)
+++ py/dist/py/test/tkinter/testing/test_util.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
from __future__ import generators
-from py.__impl__.test.tkinter import util
-from py.__impl__.test.tkinter.util import Status, TestReport, OutBuffer
+from py.__.test.tkinter import util
+from py.__.test.tkinter.util import Status, TestReport, OutBuffer
import py
Item = py.test.Item
Modified: py/dist/py/test/tkinter/tkgui.py
==============================================================================
--- py/dist/py/test/tkinter/tkgui.py (original)
+++ py/dist/py/test/tkinter/tkgui.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
import py
-from py.__impl__.test.tkinter import backend
-from py.__impl__.test.tkinter import util
+from py.__.test.tkinter import backend
+from py.__.test.tkinter import util
Null = util.Null
import ScrolledText
Modified: py/dist/py/test/tkinter/util.py
==============================================================================
--- py/dist/py/test/tkinter/util.py (original)
+++ py/dist/py/test/tkinter/util.py Tue Apr 26 11:22:20 2005
@@ -2,7 +2,7 @@
import sys
import py
-from py.__impl__.test.terminal import out
+from py.__.test.terminal import out
class Null:
""" Null objects always and reliably "do nothing." """
@@ -90,7 +90,7 @@
return not self.__eq__(other)
class OutBuffer(out.Out):
- '''Simple MockObject for py.__impl__.test.report.text.out.Out.
+ '''Simple MockObject for py.__.test.report.text.out.Out.
Used to get the output of TerminalSession.'''
def __init__(self, fullwidth = 80 -1):
self.output = []
Modified: py/dist/py/test/tool/optparse.py
==============================================================================
--- py/dist/py/test/tool/optparse.py (original)
+++ py/dist/py/test/tool/optparse.py Tue Apr 26 11:22:20 2005
@@ -69,7 +69,7 @@
import sys, os
import types
-from py.__impl__.test.tool import textwrap
+from py.__.test.tool import textwrap
class OptParseError (Exception):
def __init__ (self, msg):
Modified: py/dist/py/test/tool/testing/test_outerrcapture.py
==============================================================================
--- py/dist/py/test/tool/testing/test_outerrcapture.py (original)
+++ py/dist/py/test/tool/testing/test_outerrcapture.py Tue Apr 26 11:22:20 2005
@@ -1,6 +1,6 @@
import sys
import py
-from py.__impl__.test.tool.outerrcapture import SimpleOutErrCapture
+from py.__.test.tool.outerrcapture import SimpleOutErrCapture
def test_capturing_simple():
cap = SimpleOutErrCapture()
Modified: py/dist/py/xmlobj/html.py
==============================================================================
--- py/dist/py/xmlobj/html.py (original)
+++ py/dist/py/xmlobj/html.py Tue Apr 26 11:22:20 2005
@@ -3,7 +3,7 @@
"""
from py.xml import Namespace, Tag
-from py.__impl__.xmlobj.visit import SimpleUnicodeVisitor
+from py.__.xmlobj.visit import SimpleUnicodeVisitor
class HtmlVisitor(SimpleUnicodeVisitor):
def repr_attribute(self, attrs, name):
Modified: py/dist/py/xmlobj/xml.py
==============================================================================
--- py/dist/py/xmlobj/xml.py (original)
+++ py/dist/py/xmlobj/xml.py Tue Apr 26 11:22:20 2005
@@ -15,7 +15,7 @@
return self.unicode(indent=0)
def unicode(self, indent=2):
- from py.__impl__.xmlobj.visit import SimpleUnicodeVisitor
+ from py.__.xmlobj.visit import SimpleUnicodeVisitor
l = []
SimpleUnicodeVisitor(l.append, indent).visit(self)
return u"".join(l)
More information about the pytest-commit
mailing list