[Python-checkins] Fix docstring of Profiler class (GH-8651)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/396afbf7711aff2c3d5a34da1724980c5db82724
commit: 396afbf7711aff2c3d5a34da1724980c5db82724
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-08-03T02:43:18-07:00
summary:

Fix docstring of Profiler class (GH-8651)

(cherry picked from commit 2ebd3813af9172fe1f9b2f6004edf6f1e1e5d9f1)

Co-authored-by: INADA Naoki <methane at users.noreply.github.com>

files:
M Lib/cProfile.py
M Modules/_lsprof.c

diff --git a/Lib/cProfile.py b/Lib/cProfile.py
index b2efd047d397..d3770946db11 100755
--- a/Lib/cProfile.py
+++ b/Lib/cProfile.py
@@ -64,11 +64,11 @@ def help():
 # ____________________________________________________________
 
 class Profile(_lsprof.Profiler):
-    """Profile(custom_timer=None, time_unit=None, subcalls=True, builtins=True)
+    """Profile(timer=None, timeunit=None, subcalls=True, builtins=True)
 
     Builds a profiler object using the specified timer function.
     The default timer is a fast built-in one based on real time.
-    For custom timer functions returning integers, time_unit can
+    For custom timer functions returning integers, timeunit can
     be a float specifying a scale (i.e. how long each integer unit
     is, in seconds).
     """
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 6090c7dd2365..945354fcfab4 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -807,11 +807,11 @@ static PyMethodDef profiler_methods[] = {
 };
 
 PyDoc_STRVAR(profiler_doc, "\
-Profiler(custom_timer=None, time_unit=None, subcalls=True, builtins=True)\n\
+Profiler(timer=None, timeunit=None, subcalls=True, builtins=True)\n\
 \n\
     Builds a profiler object using the specified timer function.\n\
     The default timer is a fast built-in one based on real time.\n\
-    For custom timer functions returning integers, time_unit can\n\
+    For custom timer functions returning integers, timeunit can\n\
     be a float specifying a scale (i.e. how long each integer unit\n\
     is, in seconds).\n\
 ");