Merged revisions 77992 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77992 | barry.warsaw | 2010-02-05 13:45:25 -0500 (Fri, 05 Feb 2010) | 4 lines

  Resolve bug 7847 by including documentation for -J, -U, and -X under "Options
  you shouldn't use".
........

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index bb9ae87b2c39cd9bfb122c46b06db3628c8f58dd..ae9c88f7f86cb60ec910d2531b53c8a9f608a6ec 100644 (file)
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -276,8 +276,6 @@ Miscellaneous options
    See also :envvar:`PYTHONUNBUFFERED`.
 
 
-.. XXX should the -U option be documented?
-
 .. cmdoption:: -v
 
    Print a message each time a module is initialized, showing the place
@@ -353,9 +351,6 @@ Miscellaneous options
 
    .. note:: The line numbers in error messages will be off by one.
 
-.. XXX document -X?
-
-
 .. cmdoption:: -3
 
    Warn about Python 3.x incompatibilities which cannot be fixed trivially by
@@ -373,7 +368,30 @@ Miscellaneous options
 
    .. versionadded:: 2.6
 
+Options you shouldn't use
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. cmdoption:: -J
+
+   Reserved for use by Jython_.
+
+.. _Jython: http://jython.org
+
+.. cmdoption:: -U
+
+   Turns all string literals into unicodes globally.  Do not be tempted to use
+   this option as it will probably break your world.  It also produces
+   ``.pyc`` files with a different magic number than normal.  Instead, you can
+   enable unicode literals on a per-module basis by using::
+
+        from __future__ import unicode_literals
+
+   at the top of the file.  See :mod:`__future__` for details.
+
+.. cmdoption:: -X
 
+    Reserved for alternative implementations of Python to use for their own
+    purposes.
 
 .. _using-on-envvars:
 

diff --git a/Misc/NEWS b/Misc/NEWS
index d6c81b31651c9b0a0079fc7469aaf1377385835e..eaa82df5de21d3f4cd356c536338d584f0fbab67 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,7 +34,8 @@ Core and Builtins
   used to drop the time part of the result.
 
 - Issue #6108: unicode(exception) and str(exception) should return the same
-  message when only __str__ (and not __unicode__) is overridden in the subclass.
+  message when only __str__ (and not __unicode__) is overridden in the
+  subclass.
 
 - Issue #7491: Metaclass's __cmp__ method was ignored.
 
@@ -134,8 +135,8 @@ Library
 - Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is 
   generated in Distutils. Patch by Stephen Emslie.
 
-- Issue #4120: Drop reference to CRT from manifest when building extensions with
-  msvc9compiler.
+- Issue #4120: Drop reference to CRT from manifest when building extensions
+  with msvc9compiler.
 
 - Issue #7410: deepcopy of itertools.count() erroneously reset the count.
 
@@ -222,12 +223,15 @@ Build
   binary distribution on OSX 10.6 even when the user does not
   have the 10.4u SDK installed.
 
-- Issue #7541: when using ``python-config`` with a framework install the compiler might
-  use the wrong library.
+- Issue #7541: when using ``python-config`` with a framework install the
+  compiler might use the wrong library.
 
 Documentation
 -------------
  
+- Updating `Using Python` documentation to include description of CPython's
+  -J, -U and -X options.
+
 - Update python manual page (options -B, -O0, -s, environment variables
   PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE).