summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-12-19 20:50:34 (GMT)
committerGeorg Brandl <georg@python.org>2006-12-19 20:50:34 (GMT)
commit66a796e5ab8dd7bfc1fe05a830feb05acdab6f53 (patch)
tree5ce191f813c475bf54c6ab40ecaebb820327a213 /Misc
parent376446dd4e30006c4d4ad09b4cbda8b07e9ce23a (diff)
downloadcpython-66a796e5ab8dd7bfc1fe05a830feb05acdab6f53.zip
cpython-66a796e5ab8dd7bfc1fe05a830feb05acdab6f53.tar.gz
cpython-66a796e5ab8dd7bfc1fe05a830feb05acdab6f53.tar.bz2
Patch #1601678: move intern() to sys.intern().
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS10
-rw-r--r--Misc/python-mode.el2
2 files changed, 8 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 2c37fc20..4963dcd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,7 +12,7 @@ What's New in Python 3000?
TO DO
-----
-- See PEP 3000.
+- See PEP 3000, 3100.
- Test merging certain changes from the 2.5 HEAD code.
@@ -36,7 +36,11 @@ TO DO
Core and Builtins
-----------------
-- Renamed nb_nonzero to nb_bool and __nonzero__ to __bool__
+- Moved intern() to sys.intern().
+
+- exec is now a function.
+
+- Renamed nb_nonzero to nb_bool and __nonzero__ to __bool__.
- Classic classes are a thing of the past. All classes are new style.
@@ -90,7 +94,7 @@ Core and Builtins
- zip returns an iterator
- Additions:
- set literals
+ set literals, ellipsis literal
Extension Modules
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index e70a613..6e2741d 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -382,7 +382,7 @@ support for features needed by `python-mode'.")
"delattr" "dict" "dir" "divmod"
"enumerate" "eval" "execfile" "exit" "file"
"filter" "float" "getattr" "globals" "hasattr"
- "hash" "hex" "id" "int" "intern"
+ "hash" "hex" "id" "int"
"isinstance" "issubclass" "iter" "len" "license"
"list" "locals" "long" "map" "max" "min" "object"
"oct" "open" "ord" "pow" "property" "range"