From abe49098d3398b5727a65a3c9f7620da98fec65a Mon Sep 17 00:00:00 2001
From: DongHun Kwak <dh0128.kwak@samsung.com>
Date: Mon, 14 Jan 2019 10:44:22 +0900
Subject: [PATCH] Imported Upstream version 40.6.1

---
 CHANGES.rst                   |  6 ++++++
 setup.cfg                     |  2 +-
 setup.py                      |  2 +-
 setuptools/dist.py            |  4 ++--
 setuptools/tests/test_dist.py | 16 ++++++++++++++++
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3929703..7a3e874 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v40.6.1
+-------
+
+* #1590: Fixed regression where packages without ``author`` or ``author_email`` fields generated malformed package metadata.
+
+
 v40.6.0
 -------
 
diff --git a/setup.cfg b/setup.cfg
index fd7e8cc..9e12b65 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 40.6.0
+current_version = 40.6.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 569730d..f24b8e7 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="40.6.0",
+    version="40.6.1",
     description=(
         "Easily download, build, install, upgrade, and uninstall "
         "Python packages"
diff --git a/setuptools/dist.py b/setuptools/dist.py
index b741c64..7062ae8 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -138,8 +138,8 @@ def write_pkg_file(self, file):
     write_field('Home-page', self.get_url())
 
     if version < StrictVersion('1.2'):
-        write_field('Author:', self.get_contact())
-        write_field('Author-email:', self.get_contact_email())
+        write_field('Author', self.get_contact())
+        write_field('Author-email', self.get_contact_email())
     else:
         optional_fields = (
             ('Author', 'author'),
diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py
index a7f4452..170d27e 100644
--- a/setuptools/tests/test_dist.py
+++ b/setuptools/tests/test_dist.py
@@ -115,6 +115,20 @@ def __read_test_cases():
             merge_dicts(base_attrs, {
                 'provides_extras': ['foo', 'bar']
         }), marks=pytest.mark.xfail(reason="provides_extras not read")),
+        ('Missing author, missing author e-mail',
+         {'name': 'foo', 'version': '1.0.0'}),
+        ('Missing author',
+         {'name': 'foo',
+          'version': '1.0.0',
+          'author_email': 'snorri@sturluson.name'}),
+        ('Missing author e-mail',
+         {'name': 'foo',
+          'version': '1.0.0',
+          'author': 'Snorri Sturluson'}),
+        ('Missing author',
+         {'name': 'foo',
+          'version': '1.0.0',
+          'author': 'Snorri Sturluson'}),
     ]
 
     return test_cases
@@ -141,6 +155,8 @@ def test_read_metadata(name, attrs):
     tested_attrs = [
         ('name', dist_class.get_name),
         ('version', dist_class.get_version),
+        ('author', dist_class.get_contact),
+        ('author_email', dist_class.get_contact_email),
         ('metadata_version', dist_class.get_metadata_version),
         ('provides', dist_class.get_provides),
         ('description', dist_class.get_description),
-- 
2.7.4