summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2016-12-18 15:00:23 -0500
committerR David Murray <rdmurray@bitdance.com>2016-12-18 15:00:23 -0500
commit5607a989a4c9523d143ae85dbf3af1f692fc8ebe (patch)
treef58a85f3749fba4a9676f19bde4ba5bec4664bac
parent43e5790b489672c71d52acfdcba5325c5ec4b1f8 (diff)
parent3d1c73db098c9bc79f9db7ed738c1d87867bec66 (diff)
downloadcpython-5607a989a4c9523d143ae85dbf3af1f692fc8ebe.tar.gz
Merge: #29005: clarify terminology in tutorial 'method' discussion.
-rw-r--r--Doc/tutorial/classes.rst5
1 files changed, 2 insertions, 3 deletions
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 75c79d2526..e134d5d62e 100644
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -374,11 +374,11 @@ Surely Python raises an exception when a function that requires an argument is
called without any --- even if the argument isn't actually used...
Actually, you may have guessed the answer: the special thing about methods is
-that the object is passed as the first argument of the function. In our
+that the instance object is passed as the first argument of the function. In our
example, the call ``x.f()`` is exactly equivalent to ``MyClass.f(x)``. In
general, calling a method with a list of *n* arguments is equivalent to calling
the corresponding function with an argument list that is created by inserting
-the method's object before the first argument.
+the method's instance object before the first argument.
If you still don't understand how methods work, a look at the implementation can
perhaps clarify matters. When an instance attribute is referenced that isn't a
@@ -906,4 +906,3 @@ Examples::
namespace; the name :attr:`~object.__dict__` is an attribute but not a global name.
Obviously, using this violates the abstraction of namespace implementation, and
should be restricted to things like post-mortem debuggers.
-