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
95038fa5
Commit
95038fa5
authored
Oct 04, 2012
by
Jesus Cea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file
parent
7c0a87f2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
Lib/platform.py
Lib/platform.py
+8
-5
Misc/ACKS
Misc/ACKS
+1
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/platform.py
View file @
95038fa5
...
...
@@ -113,7 +113,7 @@ __copyright__ = """
__version__
=
'1.0.7'
import
sys
,
string
,
os
,
re
import
sys
,
string
,
os
,
re
,
subprocess
### Globals & Constants
...
...
@@ -1023,13 +1023,16 @@ def _syscmd_file(target,default=''):
if
sys
.
platform
in
(
'dos'
,
'win32'
,
'win16'
,
'os2'
):
# XXX Others too ?
return
default
target
=
_follow_symlinks
(
target
)
.
replace
(
'"'
,
'
\
\
"'
)
target
=
_follow_symlinks
(
target
)
try
:
f
=
os
.
popen
(
'file "%s" 2> %s'
%
(
target
,
DEV_NULL
))
with
open
(
DEV_NULL
)
as
dev_null
:
proc
=
subprocess
.
Popen
([
'file'
,
'-b'
,
'--'
,
target
],
stdout
=
subprocess
.
PIPE
,
stderr
=
dev_null
)
except
(
AttributeError
,
os
.
error
):
return
default
output
=
string
.
strip
(
f
.
read
()
)
rc
=
f
.
close
()
output
=
proc
.
stdout
.
read
(
)
rc
=
proc
.
wait
()
if
not
output
or
rc
:
return
default
else
:
...
...
Misc/ACKS
View file @
95038fa5
...
...
@@ -77,6 +77,7 @@ Reimer Behrends
Ben Bell
Thomas Bellman
Alexander “Саша” Belopolsky
David Benjamin
Andrew Bennetts
Andy Bensky
Bennett Benson
...
...
Misc/NEWS
View file @
95038fa5
...
...
@@ -143,6 +143,9 @@ Library
io
.
BytesIO
and
io
.
StringIO
objects
now
raise
ValueError
when
the
object
has
been
closed
.
Patch
by
Alessandro
Moura
.
-
Issue
#
16112
:
platform
.
architecture
does
not
correctly
escape
argument
to
/
usr
/
bin
/
file
.
Patch
by
David
Benjamin
.
-
Issue
#
12776
,#
11839
:
call
argparse
type
function
(
specified
by
add_argument
)
only
once
.
Before
,
the
type
function
was
called
twice
in
the
case
where
the
default
was
specified
and
the
argument
was
given
as
well
.
This
was
...
...
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