Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
3af152a2
Commit
3af152a2
authored
Aug 28, 2017
by
Jason R. Coombs
Committed by
GitHub
Aug 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract method for reading local file. Now return results directly instead of for/append loop.
parent
fc59fe8e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
16 deletions
+17
-16
setuptools/config.py
setuptools/config.py
+17
-16
No files found.
setuptools/config.py
View file @
3af152a2
...
...
@@ -252,7 +252,6 @@ class ConfigHandler(object):
:rtype: str
"""
include_directive
=
'file:'
file_contents
=
[]
if
not
isinstance
(
value
,
string_types
):
return
value
...
...
@@ -262,22 +261,24 @@ class ConfigHandler(object):
spec
=
value
[
len
(
include_directive
):]
filepaths
=
(
os
.
path
.
abspath
(
path
.
strip
())
for
path
in
spec
.
split
(
','
))
return
'
\
n
'
.
join
(
self
.
_read_local_file
(
path
)
for
path
in
filepath
if
os
.
path
.
isfile
(
path
)
)
@
staticmethod
def
_read_local_file
(
filepath
):
"""
Read contents of filepath. Raise error if the file
isn't in the current directory.
"""
if
not
filepath
.
startswith
(
os
.
getcwd
()):
raise
DistutilsOptionError
(
'`file:` directive can not access %s'
%
filepath
)
current_directory
=
os
.
getcwd
()
for
filepath
in
filepaths
:
if
not
filepath
.
startswith
(
current_directory
):
raise
DistutilsOptionError
(
'`file:` directive can not access %s'
%
filepath
)
if
os
.
path
.
isfile
(
filepath
):
with
io
.
open
(
filepath
,
encoding
=
'utf-8'
)
as
f
:
file_contents
.
append
(
f
.
read
())
if
file_contents
:
value
=
'
\
n
'
.
join
(
file_contents
)
return
value
with
io
.
open
(
filepath
,
encoding
=
'utf-8'
)
as
f
:
return
f
.
read
()
@
classmethod
def
_parse_attr
(
cls
,
value
):
...
...
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