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
07c6e716
Commit
07c6e716
authored
Aug 24, 2012
by
Brett Cannon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #15778: Coerce ImportError.args to a string when it isn't
already one. Patch by Dave Malcolm.
parent
491b1dc7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
Lib/test/test_exceptions.py
Lib/test/test_exceptions.py
+5
-0
Misc/NEWS
Misc/NEWS
+3
-0
Objects/exceptions.c
Objects/exceptions.c
+1
-1
No files found.
Lib/test/test_exceptions.py
View file @
07c6e716
...
...
@@ -937,6 +937,11 @@ class ImportErrorTests(unittest.TestCase):
self
.
assertEqual
(
exc
.
name
,
'somename'
)
self
.
assertEqual
(
exc
.
path
,
'somepath'
)
def
test_non_str_argument
(
self
):
# Issue #15778
arg
=
b'abc'
exc
=
ImportError
(
arg
)
self
.
assertEqual
(
str
(
arg
),
str
(
exc
))
def
test_main
():
...
...
Misc/NEWS
View file @
07c6e716
...
...
@@ -10,6 +10,9 @@ What's New in Python 3.3.0 Release Candidate 1?
Core and Builtins
-----------------
- Issue #15778: ensure that str(ImportError(msg)) returns a str
even when msg isn'
t
a
str
.
-
Issue
#
2051
:
Source
file
permission
bits
are
once
again
correctly
copied
to
the
cached
bytecode
file
.
(
The
migration
to
importlib
reintroduced
this
problem
because
these
was
no
regression
test
.
A
test
...
...
Objects/exceptions.c
View file @
07c6e716
...
...
@@ -679,7 +679,7 @@ ImportError_traverse(PyImportErrorObject *self, visitproc visit, void *arg)
static
PyObject
*
ImportError_str
(
PyImportErrorObject
*
self
)
{
if
(
self
->
msg
)
{
if
(
self
->
msg
&&
PyUnicode_CheckExact
(
self
->
msg
)
)
{
Py_INCREF
(
self
->
msg
);
return
self
->
msg
;
}
...
...
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