[Python-checkins] r59267 - peps/trunk/pep-3100.txt

[guido.van.rossum]

Author: guido.van.rossum
Date: Sun Dec  2 05:49:16 2007
New Revision: 59267

Modified:
   peps/trunk/pep-3100.txt
Log:
Update for __builtin__ rename.


Modified: peps/trunk/pep-3100.txt
==============================================================================
--- peps/trunk/pep-3100.txt	(original)
+++ peps/trunk/pep-3100.txt	Sun Dec  2 05:49:16 2007
@@ -97,9 +97,9 @@
     [x for x in 1, 2] will need to be:  [x for x in (1, 2)] [done]
   - Lambdas may have to be parenthesized [#pep308]_ [NO]
 
-* __builtins__ should get a different name *or* completely unified
-  with __builtin__.  Keeping both with confusingly similar spellings
-  and semantics is evil. [#__builtin__]_
+* In order to get rid of the confusion between __builtin__ and __builtins__,
+  it was decided to rename __builtin__ (the module) to builtins, and to leave
+  __builtins__ (the sandbox hook) alone. [#__builtin__]_ [#__builtins__]_ [done]
 * Attributes on functions of the form ``func_whatever`` will be renamed
   ``__whatever__`` [17]_ [done]
 * Set literals and comprehensions [19]_ [20]_ [done]
@@ -405,6 +405,9 @@
 
 .. [#__builtin__] Approach to resolving __builtin__ vs __builtins__
    http://mail.python.org/pipermail/python-3000/2007-March/006161.html
+
+.. [#__builtins__] New name for __builtins__
+   http://mail.python.org/pipermail/python-dev/2007-November/075388.html
    
 .. [#exitfunc-patch] Patch to remove sys.exitfunc
    http://www.python.org/sf/1680961