summaryrefslogtreecommitdiffstats
path: root/Doc/library/runpy.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-11-26 07:58:55 (GMT)
committerGeorg Brandl <georg@python.org>2010-11-26 07:58:55 (GMT)
commit837fbb0d9a2e2b4ecc828100eef08bf17ac2b61f (patch)
tree1ed376a3b9397bf409c7928ba7c09f0205ffb25f /Doc/library/runpy.rst
parent79f096a7aab611b6299c0944d6ab2e9552e6caca (diff)
downloadcpython-837fbb0d9a2e2b4ecc828100eef08bf17ac2b61f.zip
cpython-837fbb0d9a2e2b4ecc828100eef08bf17ac2b61f.tar.gz
cpython-837fbb0d9a2e2b4ecc828100eef08bf17ac2b61f.tar.bz2
Merged revisions 85731,85735 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85731 | georg.brandl | 2010-10-19 23:07:16 +0200 (Di, 19 Okt 2010) | 1 line Be consistent in the spelling of thread-safe(ty). ........ r85735 | georg.brandl | 2010-10-20 08:50:19 +0200 (Mi, 20 Okt 2010) | 1 line Fix r85728: use "" to mean the system default locale, which should work on more systems. ........
Diffstat (limited to 'Doc/library/runpy.rst')
-rw-r--r--Doc/library/runpy.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/runpy.rst b/Doc/library/runpy.rst
index 23d0730..905c64b 100644
--- a/Doc/library/runpy.rst
+++ b/Doc/library/runpy.rst
@@ -120,7 +120,7 @@ The :mod:`runpy` module provides two functions:
Note that, unlike :func:`run_module`, the alterations made to :mod:`sys`
are not optional in this function as these adjustments are essential to
- allowing the execution of sys.path entries. As the thread safety
+ allowing the execution of sys.path entries. As the thread-safety
limitations still apply, use of this function in threaded code should be
either serialised with the import lock or delegated to a separate process.