summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-05-23 06:35:32 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-05-23 06:35:32 (GMT)
commit8b2bfbc198c1fe0dcdfd42cc4683879cd712ccfd (patch)
tree9f3e2eed06cc877197eaadc398fb0bd12f5b9db3 /Misc
parent5f2ba9f2b1d5bd7ce9a6388dc58624403ca54547 (diff)
downloadcpython-8b2bfbc198c1fe0dcdfd42cc4683879cd712ccfd.zip
cpython-8b2bfbc198c1fe0dcdfd42cc4683879cd712ccfd.tar.gz
cpython-8b2bfbc198c1fe0dcdfd42cc4683879cd712ccfd.tar.bz2
Add -3 option to the interpreter to warn about features that are
deprecated and will be changed/removed in Python 3.0. This patch is mostly from Anthony. I tweaked some format and added a little doc.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
-rw-r--r--Misc/cheatsheet2
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index f65fece..1b027f9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6 alpha 1?
Core and builtins
-----------------
+- Add -3 option to the interpreter to warn about features that are
+ deprecated and will be changed/removed in Python 3.0.
+
- Patch #1686487: you can now pass any mapping after '**' in function
calls.
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
index 1bd487a..5d002fa 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -41,6 +41,7 @@ Option Effect
-h print this help message and exit
-i Inspect interactively after running script (also PYTHONINSPECT=x) and
force prompts, even if stdin appears not to be a terminal
+-m mod run library module as a script (terminates option list
-O optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)
-OO remove doc-strings in addition to the -O optimizations
-Q arg division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew
@@ -51,6 +52,7 @@ Option Effect
-W arg : warning control (arg is action:message:category:module:lineno)
-x Skip first line of source, allowing use of non-unix Forms of #!cmd
-? Help!
+-3 warn about Python 3.x incompatibilities
-c Specify the command to execute (see next section). This terminates the
command option list (following options are passed as arguments to the command).
the name of a python file (.py) to execute read from stdin.