summaryrefslogtreecommitdiffstats
path: root/Lib/packaging/config.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-06-10 22:21:18 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-06-10 22:21:18 (GMT)
commit8474f2901b78cc9afe9487ed9236430f43be18b7 (patch)
tree34788008e4499f2ab0ee19d9c7c36bc0d8e644eb /Lib/packaging/config.py
parent3605030c9b8b86c805c560ddab6613ddba451de1 (diff)
downloadcpython-8474f2901b78cc9afe9487ed9236430f43be18b7.zip
cpython-8474f2901b78cc9afe9487ed9236430f43be18b7.tar.gz
cpython-8474f2901b78cc9afe9487ed9236430f43be18b7.tar.bz2
setup.cfg: Document that description-file can contain more than one file
Diffstat (limited to 'Lib/packaging/config.py')
-rw-r--r--Lib/packaging/config.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/Lib/packaging/config.py b/Lib/packaging/config.py
index be75da9..3427d9a 100644
--- a/Lib/packaging/config.py
+++ b/Lib/packaging/config.py
@@ -163,21 +163,18 @@ class Config:
"mutually exclusive")
raise PackagingOptionError(msg)
- if isinstance(value, list):
- filenames = value
- else:
- filenames = value.split()
+ filenames = value.split()
- # concatenate each files
- value = ''
+ # concatenate all files
+ value = []
for filename in filenames:
# will raise if file not found
with open(filename) as description_file:
- value += description_file.read().strip() + '\n'
+ value.append(description_file.read().strip())
# add filename as a required file
if filename not in metadata.requires_files:
metadata.requires_files.append(filename)
- value = value.strip()
+ value = '\n'.join(value).strip()
key = 'description'
if metadata.is_metadata_field(key):