From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 14 Apr 2015 06:35:51 +0000 (+0300)
Subject: Issue #23943: Fix typos. Patch by Piotr Kasprzyk.
X-Git-Tag: v3.5.0a4~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfa4e045a363fd1dd31c1d57002fc78c10de85a2;p=thirdparty%2FPython%2Fcpython.git

Issue #23943: Fix typos. Patch by Piotr Kasprzyk.
---

dfa4e045a363fd1dd31c1d57002fc78c10de85a2
diff --cc Lib/test/test_doctest.py
index 665272f3cbd1,9292d9227845..bbe5a13628fb
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@@ -2172,9 -2168,9 +2172,9 @@@ def test_DocTestSuite()
           >>> test.test_doctest.sillySetup
           Traceback (most recent call last):
           ...
 -         AttributeError: 'module' object has no attribute 'sillySetup'
 +         AttributeError: module 'test.test_doctest' has no attribute 'sillySetup'
  
-        The setUp and tearDown funtions are passed test objects. Here
+        The setUp and tearDown functions are passed test objects. Here
         we'll use the setUp function to supply the missing variable y:
  
           >>> def setUp(test):
@@@ -2318,9 -2314,9 +2318,9 @@@ def test_DocFileSuite()
           >>> test.test_doctest.sillySetup
           Traceback (most recent call last):
           ...
 -         AttributeError: 'module' object has no attribute 'sillySetup'
 +         AttributeError: module 'test.test_doctest' has no attribute 'sillySetup'
  
-        The setUp and tearDown funtions are passed test objects.
+        The setUp and tearDown functions are passed test objects.
         Here, we'll use a setUp function to set the favorite color in
         test_doctest.txt:
  
diff --cc Misc/HISTORY
index 2b4760d57a1f,f48375931ab2..0462f4e4de72
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@@ -25442,28 -25409,28 +25442,28 @@@ in posixmodule (also under NT)
  
  - Unrecognized keyword arguments raise TypeError, not KeyError.
  
 -- Better portability, fewer bugs and memory leaks, fewer compiler warnings, 
 +- Better portability, fewer bugs and memory leaks, fewer compiler warnings,
  some more documentation.
  
 -- Bug in float power boundary case (0.0 to the negative integer power) 
 +- Bug in float power boundary case (0.0 to the negative integer power)
  fixed.
  
 -- The test of negative number to the float power has been moved from the 
 +- The test of negative number to the float power has been moved from the
- built-in pow() functin to floatobject.c (so complex numbers can yield the
+ built-in pow() function to floatobject.c (so complex numbers can yield the
  correct result).
  
 -- The bug introduced in beta2 where shared libraries loaded (using 
 +- The bug introduced in beta2 where shared libraries loaded (using
  dlopen()) from the current directory would fail, has been fixed.
  
 -- Modules imported as shared libraries now also have a __file__ attribute, 
 -giving the filename from which they were loaded.  The only modules without 
 +- Modules imported as shared libraries now also have a __file__ attribute,
 +giving the filename from which they were loaded.  The only modules without
  a __file__ attribute now are built-in modules.
  
 -- On the Mac, dynamically loaded modules can end in either ".slb" or 
 -".<platform>.slb" where <platform> is either "CFM68K" or "ppc".  The ".slb" 
 +- On the Mac, dynamically loaded modules can end in either ".slb" or
 +".<platform>.slb" where <platform> is either "CFM68K" or "ppc".  The ".slb"
  extension should only be used for "fat" binaries.
  
 -- C API addition: marshal.c now supports 
 +- C API addition: marshal.c now supports
  PyMarshal_WriteObjectToString(object).
  
  - C API addition: getargs.c now supports
diff --cc Misc/NEWS
index 4a9dad8e32d0,a38f395ad000..15ab72f3d0d2
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1105,12 -465,8 +1105,12 @@@ Librar
    (including empty directories) in ZIP file.
  
  - Issue #22449: In the ssl.SSLContext.load_default_certs, consult the
-   enviromental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows.
+   environmental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows.
  
 +- Issue #22508: The email.__version__ variable has been removed; the email
 +  code is no longer shipped separately from the stdlib, and __version__
 +  hasn't been updated in several releases.
 +
  - Issue #20076: Added non derived UTF-8 aliases to locale aliases table.
  
  - Issue #20079: Added locales supported in glibc 2.18 to locale alias table.