]> granicus.if.org Git - python/commitdiff
Issue #27626: Merge spelling fixes from 3.5
authorMartin Panter <vadmium+py@gmail.com>
Thu, 28 Jul 2016 01:30:58 +0000 (01:30 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Thu, 28 Jul 2016 01:30:58 +0000 (01:30 +0000)
21 files changed:
1  2 
Doc/library/importlib.rst
Doc/library/os.rst
Doc/library/socket.rst
Include/longobject.h
Lib/ctypes/test/test_structures.py
Lib/datetime.py
Lib/idlelib/calltip_w.py
Lib/idlelib/parenmatch.py
Lib/shutil.py
Lib/test/eintrdata/eintr_tester.py
Lib/test/test_collections.py
Lib/test/test_deque.py
Lib/test/test_enum.py
Lib/test/test_math.py
Lib/test/test_subprocess.py
Misc/NEWS
Modules/_ctypes/_ctypes.c
Modules/itertoolsmodule.c
Objects/exceptions.c
Objects/longobject.c
Tools/freeze/freeze.py

Simple merge
index eae724936f578e74b1d03ab87ce5e682ec06fe1b,4265bc23a1f916dcaff37e608a6419becedd203e..9456733beccda745ceb509defac0a43301fd43ae
@@@ -1938,24 -1900,10 +1938,24 @@@ features
     On Unix, *path* can be of type :class:`str` or :class:`bytes` (use
     :func:`~os.fsencode` and :func:`~os.fsdecode` to encode and decode
     :class:`bytes` paths). On Windows, *path* must be of type :class:`str`.
-    On both sytems, the type of the :attr:`~os.DirEntry.name` and
 -   On both systems, the type of the :attr:`~DirEntry.name` and
 -   :attr:`~DirEntry.path` attributes of each :class:`DirEntry` will be of
++   On both systems, the type of the :attr:`~os.DirEntry.name` and
 +   :attr:`~os.DirEntry.path` attributes of each :class:`os.DirEntry` will be of
     the same type as *path*.
  
 +   The :func:`scandir` iterator supports the :term:`context manager` protocol
 +   and has the following method:
 +
 +   .. method:: scandir.close()
 +
 +      Close the iterator and free acquired resources.
 +
 +      This is called automatically when the iterator is exhausted or garbage
 +      collected, or when an error happens during iterating.  However it
 +      is advisable to call it explicitly or use the :keyword:`with`
 +      statement.
 +
 +      .. versionadded:: 3.6
 +
     The following example shows a simple use of :func:`scandir` to display all
     the files (excluding directories) in the given *path* that don't start with
     ``'.'``. The ``entry.is_file()`` call will generally not make an additional
Simple merge
Simple merge
Simple merge
diff --cc Lib/datetime.py
Simple merge
Simple merge
index e98fac1952289ed5d467c60192234470dc77e3ff,47e10f3517bf96da0414441d446318aca81d87fa..14281141f8484d02c911e243820692afbed8c08e
@@@ -5,11 -5,11 +5,11 @@@ paren.  Paren here is used generically
  parentheses, square brackets, and curly braces.
  """
  
 -from idlelib.HyperParser import HyperParser
 -from idlelib.configHandler import idleConf
 +from idlelib.hyperparser import HyperParser
 +from idlelib.config import idleConf
  
  _openers = {')':'(',']':'[','}':'{'}
- CHECK_DELAY = 100 # miliseconds
+ CHECK_DELAY = 100 # milliseconds
  
  class ParenMatch:
      """Highlight matching parentheses
diff --cc Lib/shutil.py
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc Misc/NEWS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge