summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-05-13 05:01:58 (GMT)
committerGeorg Brandl <georg@python.org>2011-05-13 05:01:58 (GMT)
commit93ea851e83c7e87a97e618fb1ea9cb7604966a56 (patch)
treed58b559e1925db8fc14bc14132f474cdae4b2e5d /Doc
parent91ba8669174a06660c18973390dc4fe48219a878 (diff)
parent5166375045021dfb2944efee0f63d60b36dfdf58 (diff)
downloadcpython-93ea851e83c7e87a97e618fb1ea9cb7604966a56.zip
cpython-93ea851e83c7e87a97e618fb1ea9cb7604966a56.tar.gz
cpython-93ea851e83c7e87a97e618fb1ea9cb7604966a56.tar.bz2
Merge two minor doc changes into default.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/re.rst3
-rw-r--r--Doc/library/sys.rst2
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index b1c3804..b2562af 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -1325,9 +1325,10 @@ successive matches::
line_start = pos
line += 1
elif typ != 'SKIP':
+ val = mo.group(typ)
if typ == 'ID' and val in keywords:
typ = val
- yield Token(typ, mo.group(typ), line, mo.start()-line_start)
+ yield Token(typ, val, line, mo.start()-line_start)
pos = mo.end()
mo = gettok(s, pos)
if pos != len(s):
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 2bcf958..dfc2412 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -805,7 +805,7 @@ always available.
Python.
The highest possible limit is platform-dependent. A user may need to set the
- limit higher when she has a program that requires deep recursion and a platform
+ limit higher when they have a program that requires deep recursion and a platform
that supports a higher limit. This should be done with care, because a too-high
limit can lead to a crash.