Commit 50a7e5cf authored by jim's avatar jim

Tweaks to get tests to pass accross Python 2.4, 2.5, and 2.6.


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@103355 62d5b8a3-27da-0310-9561-8e5933582275
parent d3768f4a
...@@ -2893,7 +2893,11 @@ def test_suite(): ...@@ -2893,7 +2893,11 @@ def test_suite():
(re.compile('extdemo[.]pyd'), 'extdemo.so'), (re.compile('extdemo[.]pyd'), 'extdemo.so'),
(re.compile('[-d] setuptools-\S+[.]egg'), 'setuptools.egg'), (re.compile('[-d] setuptools-\S+[.]egg'), 'setuptools.egg'),
(re.compile(r'\\[\\]?'), '/'), (re.compile(r'\\[\\]?'), '/'),
]), ]+(sys.version_info < (2, 5) and [
(re.compile('.*No module named runpy.*', re.S), ''),
(re.compile('.*usage: pdb.py scriptfile .*', re.S), ''),
(re.compile('.*Error: what does not exist.*', re.S), ''),
] or [])),
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
......
...@@ -107,6 +107,7 @@ And the generated scripts invoke Python 2.4: ...@@ -107,6 +107,7 @@ And the generated scripts invoke Python 2.4:
>>> shebang == '#!' + other_executable >>> shebang == '#!' + other_executable
True True
>>> print f.read(), # doctest: +NORMALIZE_WHITESPACE >>> print f.read(), # doctest: +NORMALIZE_WHITESPACE
<BLANKLINE>
import sys import sys
<BLANKLINE> <BLANKLINE>
sys.path[0:0] = [ sys.path[0:0] = [
...@@ -116,21 +117,27 @@ And the generated scripts invoke Python 2.4: ...@@ -116,21 +117,27 @@ And the generated scripts invoke Python 2.4:
<BLANKLINE> <BLANKLINE>
_interactive = True _interactive = True
if len(sys.argv) > 1: if len(sys.argv) > 1:
import getopt _options, _args = __import__("getopt").getopt(sys.argv[1:], 'ic:m:')
_options, _args = getopt.getopt(sys.argv[1:], 'ic:')
_interactive = False _interactive = False
for (_opt, _val) in _options: for (_opt, _val) in _options:
if _opt == '-i': if _opt == '-i':
_interactive = True _interactive = True
elif _opt == '-c': elif _opt == '-c':
exec _val exec _val
elif _opt == '-m':
sys.argv[1:] = _args
_args = []
__import__("runpy").run_module(
_val, {}, "__main__", alter_sys=True)
<BLANKLINE> <BLANKLINE>
if _args: if _args:
sys.argv[:] = _args sys.argv[:] = _args
execfile(sys.argv[0]) __file__ = _args[0]
del _options, _args
execfile(__file__)
<BLANKLINE> <BLANKLINE>
if _interactive: if _interactive:
import code del _interactive
code.interact(banner="", local=globals()) __import__("code").interact(banner="", local=globals())
>>> f.close() >>> f.close()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment