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
6240bd11
Commit
6240bd11
authored
Apr 22, 2012
by
Brett Cannon
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
5c903e6e
84c0ca06
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
Lib/os.py
Lib/os.py
+2
-9
Lib/test/test_cmd_line_script.py
Lib/test/test_cmd_line_script.py
+8
-3
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/os.py
View file @
6240bd11
...
...
@@ -126,13 +126,6 @@ def _get_masked_mode(mode):
umask
(
mask
)
return
mode
&
~
mask
def
_are_same_file
(
stat1
,
stat2
):
"""Helper function that checks whether two stat results refer to the same
file.
"""
return
(
stat1
.
st_ino
==
stat2
.
st_ino
and
stat1
.
st_dev
==
stat2
.
st_dev
)
#
# Super directory utilities.
# (Inspired by Eric Raymond; the doc strings are mostly his)
...
...
@@ -345,7 +338,7 @@ if _exists("openat"):
topfd
=
open
(
top
,
O_RDONLY
)
try
:
if
(
followlinks
or
(
st
.
S_ISDIR
(
orig_st
.
st_mode
)
and
_are_same_file
(
orig_st
,
fstat
(
topfd
)))):
path
.
samestat
(
orig_st
,
fstat
(
topfd
)))):
for
x
in
_fwalk
(
topfd
,
top
,
topdown
,
onerror
,
followlinks
):
yield
x
finally
:
...
...
@@ -382,7 +375,7 @@ if _exists("openat"):
onerror
(
err
)
return
try
:
if
followlinks
or
_are_same_file
(
orig_st
,
fstat
(
dirfd
)):
if
followlinks
or
path
.
samestat
(
orig_st
,
fstat
(
dirfd
)):
dirpath
=
path
.
join
(
toppath
,
name
)
for
x
in
_fwalk
(
dirfd
,
dirpath
,
topdown
,
onerror
,
followlinks
):
yield
x
...
...
Lib/test/test_cmd_line_script.py
View file @
6240bd11
...
...
@@ -13,6 +13,8 @@ from test.script_helper import (
verbose
=
support
.
verbose
example_args
=
[
'test1'
,
'test2'
,
'test3'
]
test_source
=
"""
\
# Script may be run with optimisation enabled, so don't rely on assert
# statements being executed
...
...
@@ -36,6 +38,9 @@ print('__package__==%r' % __package__)
# Check the sys module
import sys
assertIdentical(globals(), sys.modules[__name__].__dict__)
from test import test_cmd_line_script
example_args_list = test_cmd_line_script.example_args
assertEqual(sys.argv[1:], example_args_list)
print('sys.argv[0]==%a' % sys.argv[0])
print('sys.path[0]==%a' % sys.path[0])
# Check the working directory
...
...
@@ -100,7 +105,7 @@ class CmdLineTest(unittest.TestCase):
*
cmd_line_switches
):
if
not
__debug__
:
cmd_line_switches
+=
(
'-'
+
'O'
*
sys
.
flags
.
optimize
,)
run_args
=
cmd_line_switches
+
(
script_name
,)
run_args
=
cmd_line_switches
+
(
script_name
,)
+
tuple
(
example_args
)
rc
,
out
,
err
=
assert_python_ok
(
*
run_args
)
self
.
_check_output
(
script_name
,
rc
,
out
+
err
,
expected_file
,
expected_argv0
,
expected_path0
,
expected_package
)
...
...
@@ -240,7 +245,7 @@ class CmdLineTest(unittest.TestCase):
pkg_dir
=
os
.
path
.
join
(
script_dir
,
'test_pkg'
)
make_pkg
(
pkg_dir
,
"import sys; print('init_argv0==%r' % sys.argv[0])"
)
script_name
=
_make_test_script
(
pkg_dir
,
'script'
)
rc
,
out
,
err
=
assert_python_ok
(
'-m'
,
'test_pkg.script'
)
rc
,
out
,
err
=
assert_python_ok
(
'-m'
,
'test_pkg.script'
,
*
example_args
)
if
verbose
>
1
:
print
(
out
)
expected
=
"init_argv0==%r"
%
'-m'
...
...
@@ -270,7 +275,7 @@ class CmdLineTest(unittest.TestCase):
with
support
.
temp_cwd
(
path
=
script_dir
):
with
open
(
"-m"
,
"w"
)
as
f
:
f
.
write
(
"data"
)
rc
,
out
,
err
=
assert_python_ok
(
'-m'
,
'other'
)
rc
,
out
,
err
=
assert_python_ok
(
'-m'
,
'other'
,
*
example_args
)
self
.
_check_output
(
script_name
,
rc
,
out
,
script_name
,
script_name
,
''
,
''
)
...
...
Misc/NEWS
View file @
6240bd11
...
...
@@ -146,6 +146,9 @@ Library
Tests
-----
- Issue #14026: In test_cmd_line_script, check that sys.argv is populated
correctly for the various invocation approaches (Patch by Jason Yeo)
- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging
message (Patch by Jason Yeo)
...
...
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