[Python-checkins] r77044 - in python/branches/release31-maint: Lib/imaplib.py

[mark.dickinson]

Author: mark.dickinson
Date: Thu Dec 24 17:15:31 2009
New Revision: 77044

Log:
Merged revisions 77043 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77043 | mark.dickinson | 2009-12-24 16:12:49 +0000 (Thu, 24 Dec 2009) | 9 lines
  
  Merged revisions 77041 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r77041 | mark.dickinson | 2009-12-24 16:06:58 +0000 (Thu, 24 Dec 2009) | 1 line
    
    Issue #7568:  typo in docstring.  Thanks Mike Putnam.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/imaplib.py

Modified: python/branches/release31-maint/Lib/imaplib.py
==============================================================================
--- python/branches/release31-maint/Lib/imaplib.py	(original)
+++ python/branches/release31-maint/Lib/imaplib.py	Thu Dec 24 17:15:31 2009
@@ -740,7 +740,7 @@
     def thread(self, threading_algorithm, charset, *search_criteria):
         """IMAPrev1 extension THREAD command.
 
-        (type, [data]) = <instance>.thread(threading_alogrithm, charset, search_criteria, ...)
+        (type, [data]) = <instance>.thread(threading_algorithm, charset, search_criteria, ...)
         """
         name = 'THREAD'
         typ, dat = self._simple_command(name, threading_algorithm, charset, *search_criteria)