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
50793b44
Commit
50793b44
authored
Jun 07, 2013
by
Brett Cannon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #18055: Move to importlib from imp for IDLE.
parent
b101435a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
38 deletions
+21
-38
Lib/idlelib/EditorWindow.py
Lib/idlelib/EditorWindow.py
+19
-38
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/idlelib/EditorWindow.py
View file @
50793b44
import
imp
import
importlib
import
importlib.abc
import
os
import
re
import
string
...
...
@@ -35,34 +35,6 @@ def _sphinx_version():
release
+=
'%s%s'
%
(
level
[
0
],
serial
)
return
release
def
_find_module
(
fullname
,
path
=
None
):
"""Version of imp.find_module() that handles hierarchical module names"""
file
=
None
for
tgt
in
fullname
.
split
(
'.'
):
if
file
is
not
None
:
file
.
close
()
# close intermediate files
(
file
,
filename
,
descr
)
=
imp
.
find_module
(
tgt
,
path
)
if
descr
[
2
]
==
imp
.
PY_SOURCE
:
break
# find but not load the source file
module
=
imp
.
load_module
(
tgt
,
file
,
filename
,
descr
)
try
:
path
=
module
.
__path__
except
AttributeError
:
raise
ImportError
(
'No source for module '
+
module
.
__name__
)
if
descr
[
2
]
!=
imp
.
PY_SOURCE
:
# If all of the above fails and didn't raise an exception,fallback
# to a straight import which can find __init__.py in a package.
m
=
__import__
(
fullname
)
try
:
filename
=
m
.
__file__
except
AttributeError
:
pass
else
:
file
=
None
descr
=
os
.
path
.
splitext
(
filename
)[
1
],
None
,
imp
.
PY_SOURCE
return
file
,
filename
,
descr
class
HelpDialog
(
object
):
...
...
@@ -687,20 +659,29 @@ class EditorWindow(object):
return
# XXX Ought to insert current file's directory in front of path
try
:
(
f
,
file
,
(
suffix
,
mode
,
type
))
=
_find_module
(
name
)
except
(
Nam
eError
,
ImportError
)
as
msg
:
loader
=
importlib
.
find_loader
(
name
)
except
(
Valu
eError
,
ImportError
)
as
msg
:
tkMessageBox
.
showerror
(
"Import error"
,
str
(
msg
),
parent
=
self
.
text
)
return
if
type
!=
imp
.
PY_SOURCE
:
tkMessageBox
.
showerror
(
"Unsupported type"
,
"%s is not a source module"
%
name
,
parent
=
self
.
text
)
if
loader
is
None
:
tkMessageBox
.
showerror
(
"Import error"
,
"module not found"
,
parent
=
self
.
text
)
return
if
not
isinstance
(
loader
,
importlib
.
abc
.
SourceLoader
):
tkMessageBox
.
showerror
(
"Import error"
,
"not a source-based module"
,
parent
=
self
.
text
)
return
try
:
file_path
=
loader
.
get_filename
(
name
)
except
AttributeError
:
tkMessageBox
.
showerror
(
"Import error"
,
"loader does not support get_filename"
,
parent
=
self
.
text
)
return
if
f
:
f
.
close
()
if
self
.
flist
:
self
.
flist
.
open
(
file
)
self
.
flist
.
open
(
file
_path
)
else
:
self
.
io
.
loadfile
(
file
)
self
.
io
.
loadfile
(
file
_path
)
def
open_class_browser
(
self
,
event
=
None
):
filename
=
self
.
io
.
filename
...
...
Misc/NEWS
View file @
50793b44
...
...
@@ -71,6 +71,8 @@ Library
IDLE
----
-
Issue
#
18055
:
Move
IDLE
off
of
imp
and
on
to
importlib
.
-
Issue
#
15392
:
Create
a
unittest
framework
for
IDLE
.
Initial
patch
by
Rajagopalasarma
Jayakrishnan
.
...
...
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