From e0ce1d9e0a9b085ede083b730e4b3e1b472fa6ca Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Fri, 25 May 2007 06:17:11 +0000 Subject: [PATCH] PEP 3111 (restoring input) has been implemented so mark it Final. Also wrap some long lines in the PEP. --- pep-0000.txt | 4 ++-- pep-3111.txt | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pep-0000.txt b/pep-0000.txt index 2ce4cc238..b60d0c97b 100644 --- a/pep-0000.txt +++ b/pep-0000.txt @@ -77,7 +77,6 @@ Index by Category SA 358 The "bytes" Object Schemenauer, GvR SA 3106 Revamping dict.keys(), .values() & .items() GvR SA 3109 Raising Exceptions in Python 3000 Winter - SA 3111 Simple input built-in in Python 3000 Roberge SA 3112 Bytes literals in Python 3000 Orendorff SA 3115 Metaclasses in Python 3000 Talin SA 3119 Introducing Abstract Base Classes GvR, Talin @@ -173,6 +172,7 @@ Index by Category SF 3105 Make print a function Brandl SF 3107 Function Annotations Winter, Lownds SF 3110 Catching Exceptions in Python 3000 Winter + SF 3111 Simple input built-in in Python 3000 Roberge SF 3113 Removal of Tuple Parameter Unpacking Cannon SF 3114 Renaming iterator.next() to .__next__() Yee SF 3129 Class Decorators Winter @@ -481,7 +481,7 @@ Numerical Index S 3108 Standard Library Reorganization Cannon SA 3109 Raising Exceptions in Python 3000 Winter SF 3110 Catching Exceptions in Python 3000 Winter - SA 3111 Simple input built-in in Python 3000 Roberge + SF 3111 Simple input built-in in Python 3000 Roberge SA 3112 Bytes literals in Python 3000 Orendorff SF 3113 Removal of Tuple Parameter Unpacking Cannon SF 3114 Renaming iterator.next() to .__next__() Yee diff --git a/pep-3111.txt b/pep-3111.txt index 865c38636..f29db6d61 100644 --- a/pep-3111.txt +++ b/pep-3111.txt @@ -3,7 +3,7 @@ Title: Simple input built-in in Python 3000 Version: $Revision$ Last-Modified: $Date$ Author: Andre Roberge -Status: Accepted +Status: Final Type: Standards Track Content-Type: text/x-rst Created: 13-Sep-2006 @@ -108,9 +108,9 @@ The Python 2 to 3 conversion tool will replace calls to ``input()`` with Naming Discussion ================= -With ``input()`` effectively removed from the language, the name ``raw_input()`` -makes much less sense and alternatives should be considered. The -various possibilities mentioned in various forums include:: +With ``input()`` effectively removed from the language, +the name ``raw_input()`` makes much less sense and alternatives should be +considered. The various possibilities mentioned in various forums include:: ask() ask_user() @@ -121,8 +121,8 @@ various possibilities mentioned in various forums include:: user_input() get_response() -While it was initially rejected by the BDFL, it has been suggested that the most -direct solution would be to rename "raw_input" to "input" in Python 3000. +While it was initially rejected by the BDFL, it has been suggested that the +most direct solution would be to rename "raw_input" to "input" in Python 3000. The main objection is that Python 2.x already has a function named "input", and, even though it is not going to be included in Python 3000, having a built-in function with the same name but different semantics may