[Python-checkins] cpython (merge 3.3 -> default): Merge: #17166: fix _dummy_thread import example.

[r.david.murray]

http://hg.python.org/cpython/rev/c4512797b879
changeset:   82102:c4512797b879
parent:      82099:5a0478bd5f11
parent:      82101:dfefae8df4f7
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Feb 09 13:25:12 2013 -0500
summary:
  Merge: #17166: fix _dummy_thread import example.

Report and patch by Berker Peksag.

files:
  Doc/library/_dummy_thread.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/_dummy_thread.rst b/Doc/library/_dummy_thread.rst
--- a/Doc/library/_dummy_thread.rst
+++ b/Doc/library/_dummy_thread.rst
@@ -17,7 +17,7 @@
    try:
        import _thread
    except ImportError:
-       import dummy_thread as _thread
+       import _dummy_thread as _thread
 
 Be careful to not use this module where deadlock might occur from a thread being
 created that blocks waiting for another thread to be created.  This often occurs

-- 
Repository URL: http://hg.python.org/cpython