From b713ac64a1957a05a359b5a7b1c3ff2681146fa2 Mon Sep 17 00:00:00 2001
From: Dong-hee Na <donghee.na92@gmail.com>
Date: Thu, 16 Nov 2017 02:32:45 +0900
Subject: [PATCH] bpo-32018: inspect.signature should follow PEP 8

If the parameter has an annotation and a default value,
it should follow PEP 8.
---
 Lib/inspect.py                                             | 7 +++++--
 Lib/test/test_inspect.py                                   | 4 ++--
 Lib/test/test_pydoc.py                                     | 2 +-
 .../next/Library/2017-11-16-02-32-41.bpo-32018.YMQ7Q2.rst  | 2 ++
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2017-11-16-02-32-41.bpo-32018.YMQ7Q2.rst

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 6d6fde9ee40401..69f2b6209f65c6 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -2521,11 +2521,14 @@ def __str__(self):
 
         # Add annotation and default value
         if self._annotation is not _empty:
-            formatted = '{}:{}'.format(formatted,
+            formatted = '{}: {}'.format(formatted,
                                        formatannotation(self._annotation))
 
         if self._default is not _empty:
-            formatted = '{}={}'.format(formatted, repr(self._default))
+            if self._annotation is not _empty:
+                formatted = '{} = {}'.format(formatted, repr(self._default))
+            else:
+                formatted = '{}={}'.format(formatted, repr(self._default))
 
         if kind == _VAR_POSITIONAL:
             formatted = '*' + formatted
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index e64215d4677720..13a86b12dd3d51 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -2875,12 +2875,12 @@ def test_signature_str(self):
         def foo(a:int=1, *, b, c=None, **kwargs) -> 42:
             pass
         self.assertEqual(str(inspect.signature(foo)),
-                         '(a:int=1, *, b, c=None, **kwargs) -> 42')
+                         '(a: int = 1, *, b, c=None, **kwargs) -> 42')
 
         def foo(a:int=1, *args, b, c=None, **kwargs) -> 42:
             pass
         self.assertEqual(str(inspect.signature(foo)),
-                         '(a:int=1, *args, b, c=None, **kwargs) -> 42')
+                         '(a: int = 1, *args, b, c=None, **kwargs) -> 42')
 
         def foo():
             pass
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 52830b49aea31f..2fa089320fdc7d 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -824,7 +824,7 @@ def foo(data: typing.List[typing.Any],
         T = typing.TypeVar('T')
         class C(typing.Generic[T], typing.Mapping[int, str]): ...
         self.assertEqual(pydoc.render_doc(foo).splitlines()[-1],
-                         'f\x08fo\x08oo\x08o(data:List[Any], x:int)'
+                         'f\x08fo\x08oo\x08o(data: List[Any], x: int)'
                          ' -> Iterator[Tuple[int, Any]]')
         self.assertEqual(pydoc.render_doc(C).splitlines()[2],
                          'class C\x08C(typing.Mapping)')
diff --git a/Misc/NEWS.d/next/Library/2017-11-16-02-32-41.bpo-32018.YMQ7Q2.rst b/Misc/NEWS.d/next/Library/2017-11-16-02-32-41.bpo-32018.YMQ7Q2.rst
new file mode 100644
index 00000000000000..aa8a47cb382e8c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-11-16-02-32-41.bpo-32018.YMQ7Q2.rst
@@ -0,0 +1,2 @@
+inspect.signature should follow PEP 8, if the parameter has an annotation and a
+default value. Patch by Dong-hee Na.