From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 3 Aug 2018 09:30:49 +0000 (-0700)
Subject: Fix docstring of Profiler class (GH-8651)
X-Git-Tag: v3.7.1rc1~204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28dbfb2fd343f404d0e45cc185f01181e08c7ac5;p=thirdparty%2FPython%2Fcpython.git

Fix docstring of Profiler class (GH-8651)

(cherry picked from commit 2ebd3813af9172fe1f9b2f6004edf6f1e1e5d9f1)

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

diff --git a/Lib/cProfile.py b/Lib/cProfile.py
index f166a1c43752..c044be8bf76e 100755
--- a/Lib/cProfile.py
+++ b/Lib/cProfile.py
@@ -25,11 +25,11 @@ runctx.__doc__ = _pyprofile.runctx.__doc__
 # ____________________________________________________________
 
 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 602747098bb6..233f62fe2f14 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -788,11 +788,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\
 ");