Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
1a765f5d
Commit
1a765f5d
authored
13 years ago
by
Éric Araujo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Synchronize packaging.tests.support with distutils2
parent
6e1f564e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
19 deletions
+22
-19
Lib/packaging/tests/support.py
Lib/packaging/tests/support.py
+22
-19
No files found.
Lib/packaging/tests/support.py
View file @
1a765f5d
...
...
@@ -56,8 +56,9 @@ __all__ = [
# misc. functions and decorators
'fake_dec'
,
'create_distribution'
,
'use_command'
,
'copy_xxmodule_c'
,
'fixup_build_ext'
,
'skip_2to3_optimize'
,
# imported from this module for backport purposes
'unittest'
,
'requires_zlib'
,
'skip_
2to3_optimize'
,
'skip_
unless_symlink'
,
'unittest'
,
'requires_zlib'
,
'skip_unless_symlink'
,
]
...
...
@@ -332,22 +333,18 @@ def copy_xxmodule_c(directory):
"""
filename
=
_get_xxmodule_path
()
if
filename
is
None
:
raise
unittest
.
SkipTest
(
'cannot find xxmodule.c (test must run in '
'the python build dir)'
)
raise
unittest
.
SkipTest
(
'cannot find xxmodule.c'
)
shutil
.
copy
(
filename
,
directory
)
def
_get_xxmodule_path
():
srcdir
=
sysconfig
.
get_config_var
(
'srcdir'
)
candidates
=
[
# use installed copy if available
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'xxmodule.c'
),
# otherwise try using copy from build directory
os
.
path
.
join
(
srcdir
,
'Modules'
,
'xxmodule.c'
),
]
for
path
in
candidates
:
if
os
.
path
.
exists
(
path
):
return
path
if
sysconfig
.
is_python_build
():
srcdir
=
sysconfig
.
get_config_var
(
'projectbase'
)
path
=
os
.
path
.
join
(
os
.
getcwd
(),
srcdir
,
'Modules'
,
'xxmodule.c'
)
else
:
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'xxmodule.c'
)
if
os
.
path
.
exists
(
path
):
return
path
def
fixup_build_ext
(
cmd
):
...
...
@@ -355,20 +352,21 @@ def fixup_build_ext(cmd):
When Python was built with --enable-shared on Unix, -L. is not enough to
find libpython<blah>.so, because regrtest runs in a tempdir, not in the
source directory where the .so lives.
source directory where the .so lives. (Mac OS X embeds absolute paths
to shared libraries into executables, so the fixup is a no-op on that
platform.)
When Python was built with in debug mode on Windows, build_ext commands
need their debug attribute set, and it is not done automatically for
some reason.
This function handles both of these things. Example use:
This function handles both of these things, and also fixes
cmd.distribution.include_dirs if the running Python is an uninstalled
build. Example use:
cmd = build_ext(dist)
support.fixup_build_ext(cmd)
cmd.ensure_finalized()
Unlike most other Unix platforms, Mac OS X embeds absolute paths
to shared libraries into executables, so the fixup is not needed there.
"""
if
os
.
name
==
'nt'
:
cmd
.
debug
=
sys
.
executable
.
endswith
(
'_d.exe'
)
...
...
@@ -386,12 +384,17 @@ def fixup_build_ext(cmd):
name
,
equals
,
value
=
runshared
.
partition
(
'='
)
cmd
.
library_dirs
=
value
.
split
(
os
.
pathsep
)
# Allow tests to run with an uninstalled Python
if
sysconfig
.
is_python_build
():
pysrcdir
=
sysconfig
.
get_config_var
(
'projectbase'
)
cmd
.
distribution
.
include_dirs
.
append
(
os
.
path
.
join
(
pysrcdir
,
'Include'
))
try
:
from
test.support
import
skip_unless_symlink
except
ImportError
:
skip_unless_symlink
=
unittest
.
skip
(
'requires test.support.skip_unless_symlink'
)
skip_2to3_optimize
=
unittest
.
skipIf
(
sys
.
flags
.
optimize
,
"2to3 doesn't work under -O"
)
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment