]> granicus.if.org Git - python/commitdiff
Issue #27171: Merge typo fixes from 3.5
authorMartin Panter <vadmium+py@gmail.com>
Thu, 2 Jun 2016 10:11:18 +0000 (10:11 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Thu, 2 Jun 2016 10:11:18 +0000 (10:11 +0000)
17 files changed:
1  2 
Lib/_pydecimal.py
Lib/_pyio.py
Lib/distutils/tests/test_build_ext.py
Lib/idlelib/autocomplete.py
Lib/idlelib/multicall.py
Lib/site.py
Lib/test/test_bigmem.py
Lib/test/test_pep3151.py
Lib/test/test_socket.py
Lib/tkinter/__init__.py
Misc/NEWS
Modules/_datetimemodule.c
Modules/_lzmamodule.c
Modules/readline.c
Objects/exceptions.c
Objects/unicodeobject.c
setup.py

Simple merge
diff --cc Lib/_pyio.py
Simple merge
Simple merge
index 6e75f67947fc501f3910cf76e1868a7ae5ef9b14,ff085d5c70bc74a4a7d4be4fbb8df57ba0bff244..5ba8dc5dd5e4932a2ec881bcc8d6bb1cd4c94acc
@@@ -1,6 -1,6 +1,6 @@@
 -"""AutoComplete.py - An IDLE extension for automatically completing names.
 +"""autocomplete.py - An IDLE extension for automatically completing names.
  
- This extension can complete either attribute names of file names. It can pop
+ This extension can complete either attribute names or file names. It can pop
  a window with all available names, for the user to select from.
  """
  import os
Simple merge
diff --cc Lib/site.py
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
diff --cc setup.py
Simple merge