Mercurial > cpython-lru_cache-weakref

annotate Lib/test/script_helper.py @ 80661:94de77bd0b4b 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #16194: document imp.load_dynamic problems when read several extension modules from the same binary object file.
author Andrew Svetlov <andrew.svetlov@gmail.com>
date Thu, 29 Nov 2012 19:51:28 +0200
parents d7aff4423172
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
1 # Common utility functions used by various script execution tests
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
2 # e.g. test_cmd_line, test_cmd_line_script and test_runpy
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
3
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
4 import sys
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
5 import os
67921
89d52effc30a Merged revisions 86542,87136,87216,87221,87228,87256,87337-87338,87372,87516,87571,88164 via svnmerge from
R. David Murray <rdmurray@bitdance.com>
parents: 66139
diff changeset
6 import re
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
7 import os.path
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
8 import tempfile
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
9 import subprocess
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
10 import py_compile
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
11 import contextlib
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
12 import shutil
77072
d7aff4423172 Issue #8767: Restore building with --disable-unicode.
Martin v. Löwis <martin@v.loewis.de>
parents: 67921
diff changeset
13 try:
d7aff4423172 Issue #8767: Restore building with --disable-unicode.
Martin v. Löwis <martin@v.loewis.de>
parents: 67921
diff changeset
14 import zipfile
d7aff4423172 Issue #8767: Restore building with --disable-unicode.
Martin v. Löwis <martin@v.loewis.de>
parents: 67921
diff changeset
15 except ImportError:
d7aff4423172 Issue #8767: Restore building with --disable-unicode.
Martin v. Löwis <martin@v.loewis.de>
parents: 67921
diff changeset
16 # If Python is build without Unicode support, importing _io will
d7aff4423172 Issue #8767: Restore building with --disable-unicode.
Martin v. Löwis <martin@v.loewis.de>
parents: 67921
diff changeset
17 # fail, which, in turn, means that zipfile cannot be imported
d7aff4423172 Issue #8767: Restore building with --disable-unicode.
Martin v. Löwis <martin@v.loewis.de>
parents: 67921
diff changeset
18 # Most of this module can then still be used.
d7aff4423172 Issue #8767: Restore building with --disable-unicode.
Martin v. Löwis <martin@v.loewis.de>
parents: 67921
diff changeset
19 pass
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
20
67921
89d52effc30a Merged revisions 86542,87136,87216,87221,87228,87256,87337-87338,87372,87516,87571,88164 via svnmerge from
R. David Murray <rdmurray@bitdance.com>
parents: 66139
diff changeset
21 from test.test_support import strip_python_stderr
89d52effc30a Merged revisions 86542,87136,87216,87221,87228,87256,87337-87338,87372,87516,87571,88164 via svnmerge from
R. David Murray <rdmurray@bitdance.com>
parents: 66139
diff changeset
22
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
23 # Executing the interpreter in a subprocess
66139
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
24 def _assert_python(expected_success, *args, **env_vars):
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
25 cmd_line = [sys.executable]
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
26 if not env_vars:
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
27 cmd_line.append('-E')
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
28 cmd_line.extend(args)
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
29 # Need to preserve the original environment, for in-place testing of
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
30 # shared library builds.
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
31 env = os.environ.copy()
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
32 env.update(env_vars)
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
33 p = subprocess.Popen(cmd_line, stdin=subprocess.PIPE,
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
34 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
35 env=env)
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
36 try:
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
37 out, err = p.communicate()
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
38 finally:
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
39 subprocess._cleanup()
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
40 p.stdout.close()
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
41 p.stderr.close()
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
42 rc = p.returncode
67921
89d52effc30a Merged revisions 86542,87136,87216,87221,87228,87256,87337-87338,87372,87516,87571,88164 via svnmerge from
R. David Murray <rdmurray@bitdance.com>
parents: 66139
diff changeset
43 err = strip_python_stderr(err)
66139
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
44 if (rc and expected_success) or (not rc and not expected_success):
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
45 raise AssertionError(
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
46 "Process return code is %d, "
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
47 "stderr follows:\n%s" % (rc, err.decode('ascii', 'ignore')))
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
48 return rc, out, err
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
49
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
50 def assert_python_ok(*args, **env_vars):
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
51 """
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
52 Assert that running the interpreter with `args` and optional environment
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
53 variables `env_vars` is ok and return a (return code, stdout, stderr) tuple.
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
54 """
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
55 return _assert_python(True, *args, **env_vars)
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
56
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
57 def assert_python_failure(*args, **env_vars):
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
58 """
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
59 Assert that running the interpreter with `args` and optional environment
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
60 variables `env_vars` fails and return a (return code, stdout, stderr) tuple.
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
61 """
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
62 return _assert_python(False, *args, **env_vars)
74a5894b9513 I'm only backporting the tests here.
Antoine Pitrou <solipsis@pitrou.net>
parents: 60722
diff changeset
63
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
64 def python_exit_code(*args):
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
65 cmd_line = [sys.executable, '-E']
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
66 cmd_line.extend(args)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
67 with open(os.devnull, 'w') as devnull:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
68 return subprocess.call(cmd_line, stdout=devnull,
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
69 stderr=subprocess.STDOUT)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
70
60722
4092e4566db3 Issue #8438: Remove reference to the missing "surrogateescape" encoding
Antoine Pitrou <solipsis@pitrou.net>
parents: 57616
diff changeset
71 def spawn_python(*args, **kwargs):
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
72 cmd_line = [sys.executable, '-E']
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
73 cmd_line.extend(args)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
74 return subprocess.Popen(cmd_line, stdin=subprocess.PIPE,
60722
4092e4566db3 Issue #8438: Remove reference to the missing "surrogateescape" encoding
Antoine Pitrou <solipsis@pitrou.net>
parents: 57616
diff changeset
75 stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
4092e4566db3 Issue #8438: Remove reference to the missing "surrogateescape" encoding
Antoine Pitrou <solipsis@pitrou.net>
parents: 57616
diff changeset
76 **kwargs)
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
77
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
78 def kill_python(p):
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
79 p.stdin.close()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
80 data = p.stdout.read()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
81 p.stdout.close()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
82 # try to cleanup the child so we don't appear to leak when running
57616
5b8683a95eae Merged revisions 76716 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 57291
diff changeset
83 # with regrtest -R.
5b8683a95eae Merged revisions 76716 via svnmerge from
Antoine Pitrou <solipsis@pitrou.net>
parents: 57291
diff changeset
84 p.wait()
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
85 subprocess._cleanup()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
86 return data
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
87
60722
4092e4566db3 Issue #8438: Remove reference to the missing "surrogateescape" encoding
Antoine Pitrou <solipsis@pitrou.net>
parents: 57616
diff changeset
88 def run_python(*args, **kwargs):
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
89 if __debug__:
60722
4092e4566db3 Issue #8438: Remove reference to the missing "surrogateescape" encoding
Antoine Pitrou <solipsis@pitrou.net>
parents: 57616
diff changeset
90 p = spawn_python(*args, **kwargs)
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
91 else:
60722
4092e4566db3 Issue #8438: Remove reference to the missing "surrogateescape" encoding
Antoine Pitrou <solipsis@pitrou.net>
parents: 57616
diff changeset
92 p = spawn_python('-O', *args, **kwargs)
57291
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
93 stdout_data = kill_python(p)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
94 return p.wait(), stdout_data
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
95
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
96 # Script creation utilities
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
97 @contextlib.contextmanager
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
98 def temp_dir():
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
99 dirname = tempfile.mkdtemp()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
100 dirname = os.path.realpath(dirname)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
101 try:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
102 yield dirname
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
103 finally:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
104 shutil.rmtree(dirname)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
105
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
106 def make_script(script_dir, script_basename, source):
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
107 script_filename = script_basename+os.extsep+'py'
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
108 script_name = os.path.join(script_dir, script_filename)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
109 script_file = open(script_name, 'w')
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
110 script_file.write(source)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
111 script_file.close()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
112 return script_name
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
113
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
114 def compile_script(script_name):
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
115 py_compile.compile(script_name, doraise=True)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
116 if __debug__:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
117 compiled_name = script_name + 'c'
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
118 else:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
119 compiled_name = script_name + 'o'
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
120 return compiled_name
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
121
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
122 def make_zip_script(zip_dir, zip_basename, script_name, name_in_zip=None):
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
123 zip_filename = zip_basename+os.extsep+'zip'
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
124 zip_name = os.path.join(zip_dir, zip_filename)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
125 zip_file = zipfile.ZipFile(zip_name, 'w')
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
126 if name_in_zip is None:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
127 name_in_zip = os.path.basename(script_name)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
128 zip_file.write(script_name, name_in_zip)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
129 zip_file.close()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
130 #if test.test_support.verbose:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
131 # zip_file = zipfile.ZipFile(zip_name, 'r')
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
132 # print 'Contents of %r:' % zip_name
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
133 # zip_file.printdir()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
134 # zip_file.close()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
135 return zip_name, os.path.join(zip_name, name_in_zip)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
136
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
137 def make_pkg(pkg_dir):
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
138 os.mkdir(pkg_dir)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
139 make_script(pkg_dir, '__init__', '')
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
140
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
141 def make_zip_pkg(zip_dir, zip_basename, pkg_name, script_basename,
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
142 source, depth=1, compiled=False):
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
143 unlink = []
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
144 init_name = make_script(zip_dir, '__init__', '')
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
145 unlink.append(init_name)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
146 init_basename = os.path.basename(init_name)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
147 script_name = make_script(zip_dir, script_basename, source)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
148 unlink.append(script_name)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
149 if compiled:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
150 init_name = compile_script(init_name)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
151 script_name = compile_script(script_name)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
152 unlink.extend((init_name, script_name))
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
153 pkg_names = [os.sep.join([pkg_name]*i) for i in range(1, depth+1)]
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
154 script_name_in_zip = os.path.join(pkg_names[-1], os.path.basename(script_name))
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
155 zip_filename = zip_basename+os.extsep+'zip'
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
156 zip_name = os.path.join(zip_dir, zip_filename)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
157 zip_file = zipfile.ZipFile(zip_name, 'w')
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
158 for name in pkg_names:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
159 init_name_in_zip = os.path.join(name, init_basename)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
160 zip_file.write(init_name, init_name_in_zip)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
161 zip_file.write(script_name, script_name_in_zip)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
162 zip_file.close()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
163 for name in unlink:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
164 os.unlink(name)
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
165 #if test.test_support.verbose:
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
166 # zip_file = zipfile.ZipFile(zip_name, 'r')
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
167 # print 'Contents of %r:' % zip_name
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
168 # zip_file.printdir()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
169 # zip_file.close()
fd417cd64341 Merged revisions 76286-76287,76289-76294,76296-76299,76301-76305,76307,76310-76311,76313-76322 via svnmerge from
Nick Coghlan <ncoghlan@gmail.com>
parents:
diff changeset
170 return zip_name, os.path.join(zip_name, script_name_in_zip)