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
3202bc4b
Commit
3202bc4b
authored
Aug 23, 2013
by
Brett Cannon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #18755: Allow imp.load_*() loaders to have get_data() called
multiple times.
parent
c0e7757a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
Lib/imp.py
Lib/imp.py
+7
-2
Lib/test/test_imp.py
Lib/test/test_imp.py
+7
-0
No files found.
Lib/imp.py
View file @
3202bc4b
...
@@ -90,13 +90,18 @@ class _HackedGetData:
...
@@ -90,13 +90,18 @@ class _HackedGetData:
def
get_data
(
self
,
path
):
def
get_data
(
self
,
path
):
"""Gross hack to contort loader to deal w/ load_*()'s bad API."""
"""Gross hack to contort loader to deal w/ load_*()'s bad API."""
if
self
.
file
and
path
==
self
.
path
:
if
self
.
file
and
path
==
self
.
path
:
with
self
.
file
:
if
not
self
.
file
.
closed
:
file
=
self
.
file
else
:
self
.
file
=
file
=
open
(
self
.
path
,
'r'
)
with
file
:
# Technically should be returning bytes, but
# Technically should be returning bytes, but
# SourceLoader.get_code() just passed what is returned to
# SourceLoader.get_code() just passed what is returned to
# compile() which can handle str. And converting to bytes would
# compile() which can handle str. And converting to bytes would
# require figuring out the encoding to decode to and
# require figuring out the encoding to decode to and
# tokenize.detect_encoding() only accepts bytes.
# tokenize.detect_encoding() only accepts bytes.
return
self
.
file
.
read
()
return
file
.
read
()
else
:
else
:
return
super
().
get_data
(
path
)
return
super
().
get_data
(
path
)
...
...
Lib/test/test_imp.py
View file @
3202bc4b
...
@@ -248,6 +248,13 @@ class ImportTests(unittest.TestCase):
...
@@ -248,6 +248,13 @@ class ImportTests(unittest.TestCase):
return
return
imp
.
load_module
(
name
,
None
,
*
found
[
1
:])
imp
.
load_module
(
name
,
None
,
*
found
[
1
:])
def
test_multiple_calls_to_get_data
(
self
):
# Issue #18755: make sure multiple calls to get_data() can succeed.
loader
=
imp
.
_LoadSourceCompatibility
(
'imp'
,
imp
.
__file__
,
open
(
imp
.
__file__
))
loader
.
get_data
(
imp
.
__file__
)
# File should be closed
loader
.
get_data
(
imp
.
__file__
)
# Will need to create a newly opened file
class
ReloadTests
(
unittest
.
TestCase
):
class
ReloadTests
(
unittest
.
TestCase
):
...
...
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