summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoridle sign <idlesign@yandex.ru>2016-12-05 22:07:16 +0700
committeridle sign <idlesign@yandex.ru>2016-12-05 22:07:16 +0700
commitacaece809ee3592c0d135a9a0a8e556db0a9e587 (patch)
treed91d64b20c65b6df8af109a2e27ee0964c743b04
parentaf321fc6ad82c54a78e7c1a74601e0a6b34997da (diff)
downloadpython-setuptools-git-acaece809ee3592c0d135a9a0a8e556db0a9e587.tar.gz
Tests and docstrings update.
-rw-r--r--setuptools/config.py6
-rw-r--r--setuptools/tests/test_config.py4
2 files changed, 7 insertions, 3 deletions
diff --git a/setuptools/config.py b/setuptools/config.py
index c2319ed5..2dd42893 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -87,7 +87,7 @@ class ConfigHandler(object):
:param separator: List items separator character.
:rtype: list
"""
- if isinstance(value, list): # _parse_complex case
+ if isinstance(value, list): # _get_parser_compound case
return value
if '\n' in value:
@@ -250,7 +250,7 @@ class ConfigHandler(object):
for section_name, section_options in self.sections.items():
method_postfix = ''
- if section_name: # [section:option] variant
+ if section_name: # [section.option] variant
method_postfix = '_%s' % section_name
section_parser_method = getattr(
@@ -258,7 +258,7 @@ class ConfigHandler(object):
if section_parser_method is None:
raise DistutilsOptionError(
- 'Unsupported distribution option section: [%s:%s]' % (
+ 'Unsupported distribution option section: [%s.%s]' % (
self.section_prefix, section_name))
section_parser_method(section_options)
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 9fb55b06..259a396a 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -66,6 +66,8 @@ class TestMetadata:
'keywords = one, two\n'
'provides = package, package.sub\n'
'license = otherlic\n'
+ 'download_url = http://test.test.com/test/\n'
+ 'maintainer_email = test@test.com\n'
)
tmpdir.join('README').write('readme contents\nline2')
@@ -85,6 +87,8 @@ class TestMetadata:
assert metadata.license == 'BSD 3-Clause License'
assert metadata.name == 'fake_name'
assert metadata.keywords == ['one', 'two']
+ assert metadata.download_url == 'http://test.test.com/test/'
+ assert metadata.maintainer_email == 'test@test.com'
def test_file_sandboxed(self, tmpdir):