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
12704e60
Commit
12704e60
authored
Sep 26, 2016
by
Berker Peksag
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #18893: Fix invalid exception handling in Lib/ctypes/macholib/dyld.py
Patch by Madison May.
parent
95706d7c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
Lib/ctypes/macholib/dyld.py
Lib/ctypes/macholib/dyld.py
+3
-2
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/ctypes/macholib/dyld.py
View file @
12704e60
...
...
@@ -135,10 +135,11 @@ def framework_find(fn, executable_path=None, env=None):
Python.framework
Python.framework/Versions/Current
"""
error
=
None
try
:
return
dyld_find
(
fn
,
executable_path
=
executable_path
,
env
=
env
)
except
ValueError
as
e
:
pass
error
=
e
fmwk_index
=
fn
.
rfind
(
'.framework'
)
if
fmwk_index
==
-
1
:
fmwk_index
=
len
(
fn
)
...
...
@@ -147,7 +148,7 @@ def framework_find(fn, executable_path=None, env=None):
try
:
return
dyld_find
(
fn
,
executable_path
=
executable_path
,
env
=
env
)
except
ValueError
:
raise
e
raise
e
rror
def
test_dyld_find
():
env
=
{}
...
...
Misc/NEWS
View file @
12704e60
...
...
@@ -80,6 +80,9 @@ Core and Builtins
Library
-------
- Issue #18893: Fix invalid exception handling in Lib/ctypes/macholib/dyld.py.
Patch by Madison May.
- Issue #27611: Fixed support of default root window in the tkinter.tix module.
- Issue #27348: In the traceback module, restore the formatting of exception
...
...
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