summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoridle sign <idlesign@yandex.ru>2016-12-04 16:22:07 +0700
committeridle sign <idlesign@yandex.ru>2016-12-04 16:22:07 +0700
commit68c03bee07c55a9c337f1cb98fc102a3710add4b (patch)
tree92aa785736df872b77b93427b6bddb374e851a49
parent566e9aee17dbe2cec92b9d793f2466681f2b1a7f (diff)
downloadpython-setuptools-git-68c03bee07c55a9c337f1cb98fc102a3710add4b.tar.gz
Section names now dot-separated to mimic .toml table names.
-rw-r--r--setuptools/config.py2
-rw-r--r--setuptools/tests/test_config.py16
2 files changed, 10 insertions, 8 deletions
diff --git a/setuptools/config.py b/setuptools/config.py
index 5c73ca62..a04c3ce8 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -32,7 +32,7 @@ class ConfigHandler(object):
if not section_name.startswith(section_prefix):
continue
- section_name = section_name.replace(section_prefix, '').strip(':')
+ section_name = section_name.replace(section_prefix, '').strip('.')
sections[section_name] = section_options
self.target_obj = target_obj
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index bfc863ec..e53b5ffd 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -157,7 +157,7 @@ class TestMetadata:
fake_env(
tmpdir,
- '[metadata:some]\n'
+ '[metadata.some]\n'
'key = val\n'
)
with get_dist(tmpdir, parse=False) as dist:
@@ -187,7 +187,7 @@ class TestMetadata:
# From section.
tmpdir.join('setup.cfg').write(
- '[metadata:classifiers]\n'
+ '[metadata.classifiers]\n'
'Framework :: Django\n'
'Programming Language :: Python :: 3.5\n'
)
@@ -329,11 +329,11 @@ class TestOptions:
def test_package_data(self, tmpdir):
fake_env(
tmpdir,
- '[options:package_data]\n'
+ '[options.package_data]\n'
'* = *.txt, *.rst\n'
'hello = *.msg\n'
'\n'
- '[options:exclude_package_data]\n'
+ '[options.exclude_package_data]\n'
'* = fake1.txt, fake2.txt\n'
'hello = *.dat\n'
)
@@ -373,9 +373,11 @@ class TestOptions:
def test_extras_require(self, tmpdir):
fake_env(
tmpdir,
- '[options:extras_require]\n'
+ '[options.extras_require]\n'
'pdf = ReportLab>=1.2; RXP\n'
- 'rest = docutils>=0.3; pack ==1.1, ==1.3\n'
+ 'rest = \n'
+ ' docutils>=0.3\n'
+ ' pack ==1.1, ==1.3\n'
)
with get_dist(tmpdir) as dist:
@@ -387,7 +389,7 @@ class TestOptions:
def test_entry_points(self, tmpdir):
fake_env(
tmpdir,
- '[options:entry_points]\n'
+ '[options.entry_points]\n'
'group1 = point1 = pack.module:func, '
'.point2 = pack.module2:func_rest [rest]\n'
'group2 = point3 = pack.module:func2\n'