[Python-checkins] r68220 - in python/trunk/Doc: c-api/buffer.rst c-api/conversion.rst c-api/init.rst c-api/long.rst c-api/module.rst c-api/reflection.rst c-api/sequence.rst c-api/set.rst c-api/structures.rst distutils/apiref.rst distutils/builtdist.rst distutils/configfile.rst distutils/packageindex.rst distutils/setupscript.rst documenting/markup.rst extending/building.rst extending/extending.rst extending/newtypes.rst extending/windows.rst glossary.rst howto/curses.rst howto/doanddont.rst howto/functional.rst howto/regex.rst howto/sockets.rst howto/unicode.rst howto/urllib2.rst howto/webservers.rst install/index.rst library/abc.rst library/aifc.rst library/al.rst library/ast.rst library/audioop.rst library/bastion.rst library/bdb.rst library/bsddb.rst library/bz2.rst library/cd.rst library/cmath.rst library/codeop.rst library/collections.rst library/compiler.rst library/crypt.rst library/csv.rst library/datetime.rst library/decimal.rst library/difflib.rst library/dircache.rst library/dis.rst library/dl.rst library/email.mime.rst library/fileinput.rst library/fl.rst library/fm.rst library/fpformat.rst library/functions.rst library/gl.rst library/heapq.rst library/htmllib.rst library/idle.rst library/imageop.rst library/imgfile.rst library/io.rst library/itertools.rst library/jpeg.rst library/json.rst library/locale.rst library/macos.rst library/mailbox.rst library/marshal.rst library/math.rst library/mhlib.rst library/mmap.rst library/msvcrt.rst library/multiprocessing.rst library/mutex.rst library/nntplib.rst library/operator.rst library/optparse.rst library/os.rst library/ossaudiodev.rst library/othergui.rst library/pdb.rst library/pickle.rst library/popen2.rst library/profile.rst library/pyexpat.rst library/re.rst library/rexec.rst library/rlcompleter.rst library/robotparser.rst library/sched.rst library/sgmllib.rst library/shutil.rst library/signal.rst library/simplexmlrpcserver.rst library/smtplib.rst library/socket.rst library/sqlite3.rst library/ssl.rst library/statvfs.rst library/stdtypes.rst library/string.rst library/stringio.rst library/subprocess.rst library/sunaudio.rst library/sys.rst library/tk.rst library/tkinter.rst library/trace.rst library/traceback.rst library/turtle.rst library/undoc.rst library/unicodedata.rst library/unittest.rst library/urllib.rst library/urllib2.rst library/warnings.rst library/webbrowser.rst library/wsgiref.rst library/xml.etree.elementtree.rst library/zipfile.rst library/zipimport.rst license.rst reference/expressions.rst reference/lexical_analysis.rst reference/simple_stmts.rst tutorial/classes.rst tutorial/controlflow.rst tutorial/datastructures.rst tutorial/errors.rst tutorial/index.rst tutorial/inputoutput.rst tutorial/interpreter.rst tutorial/introduction.rst tutorial/modules.rst tutorial/stdlib.rst tutorial/whatnow.rst using/cmdline.rst using/unix.rst using/windows.rst whatsnew/2.0.rst whatsnew/2.1.rst whatsnew/2.2.rst whatsnew/2.3.rst whatsnew/2.4.rst whatsnew/2.5.rst whatsnew/2.6.rst
georg.brandl
python-checkins at python.org
Sat Jan 3 21:55:08 CET 2009
Author: georg.brandl
Date: Sat Jan 3 21:55:06 2009
New Revision: 68220
Log:
Remove trailing whitespace.
Modified:
python/trunk/Doc/c-api/buffer.rst
python/trunk/Doc/c-api/conversion.rst
python/trunk/Doc/c-api/init.rst
python/trunk/Doc/c-api/long.rst
python/trunk/Doc/c-api/module.rst
python/trunk/Doc/c-api/reflection.rst
python/trunk/Doc/c-api/sequence.rst
python/trunk/Doc/c-api/set.rst
python/trunk/Doc/c-api/structures.rst
python/trunk/Doc/distutils/apiref.rst
python/trunk/Doc/distutils/builtdist.rst
python/trunk/Doc/distutils/configfile.rst
python/trunk/Doc/distutils/packageindex.rst
python/trunk/Doc/distutils/setupscript.rst
python/trunk/Doc/documenting/markup.rst
python/trunk/Doc/extending/building.rst
python/trunk/Doc/extending/extending.rst
python/trunk/Doc/extending/newtypes.rst
python/trunk/Doc/extending/windows.rst
python/trunk/Doc/glossary.rst
python/trunk/Doc/howto/curses.rst
python/trunk/Doc/howto/doanddont.rst
python/trunk/Doc/howto/functional.rst
python/trunk/Doc/howto/regex.rst
python/trunk/Doc/howto/sockets.rst
python/trunk/Doc/howto/unicode.rst
python/trunk/Doc/howto/urllib2.rst
python/trunk/Doc/howto/webservers.rst
python/trunk/Doc/install/index.rst
python/trunk/Doc/library/abc.rst
python/trunk/Doc/library/aifc.rst
python/trunk/Doc/library/al.rst
python/trunk/Doc/library/ast.rst
python/trunk/Doc/library/audioop.rst
python/trunk/Doc/library/bastion.rst
python/trunk/Doc/library/bdb.rst
python/trunk/Doc/library/bsddb.rst
python/trunk/Doc/library/bz2.rst
python/trunk/Doc/library/cd.rst
python/trunk/Doc/library/cmath.rst
python/trunk/Doc/library/codeop.rst
python/trunk/Doc/library/collections.rst
python/trunk/Doc/library/compiler.rst
python/trunk/Doc/library/crypt.rst
python/trunk/Doc/library/csv.rst
python/trunk/Doc/library/datetime.rst
python/trunk/Doc/library/decimal.rst
python/trunk/Doc/library/difflib.rst
python/trunk/Doc/library/dircache.rst
python/trunk/Doc/library/dis.rst
python/trunk/Doc/library/dl.rst
python/trunk/Doc/library/email.mime.rst
python/trunk/Doc/library/fileinput.rst
python/trunk/Doc/library/fl.rst
python/trunk/Doc/library/fm.rst
python/trunk/Doc/library/fpformat.rst
python/trunk/Doc/library/functions.rst
python/trunk/Doc/library/gl.rst
python/trunk/Doc/library/heapq.rst
python/trunk/Doc/library/htmllib.rst
python/trunk/Doc/library/idle.rst
python/trunk/Doc/library/imageop.rst
python/trunk/Doc/library/imgfile.rst
python/trunk/Doc/library/io.rst
python/trunk/Doc/library/itertools.rst
python/trunk/Doc/library/jpeg.rst
python/trunk/Doc/library/json.rst
python/trunk/Doc/library/locale.rst
python/trunk/Doc/library/macos.rst
python/trunk/Doc/library/mailbox.rst
python/trunk/Doc/library/marshal.rst
python/trunk/Doc/library/math.rst
python/trunk/Doc/library/mhlib.rst
python/trunk/Doc/library/mmap.rst
python/trunk/Doc/library/msvcrt.rst
python/trunk/Doc/library/multiprocessing.rst
python/trunk/Doc/library/mutex.rst
python/trunk/Doc/library/nntplib.rst
python/trunk/Doc/library/operator.rst
python/trunk/Doc/library/optparse.rst
python/trunk/Doc/library/os.rst
python/trunk/Doc/library/ossaudiodev.rst
python/trunk/Doc/library/othergui.rst
python/trunk/Doc/library/pdb.rst
python/trunk/Doc/library/pickle.rst
python/trunk/Doc/library/popen2.rst
python/trunk/Doc/library/profile.rst
python/trunk/Doc/library/pyexpat.rst
python/trunk/Doc/library/re.rst
python/trunk/Doc/library/rexec.rst
python/trunk/Doc/library/rlcompleter.rst
python/trunk/Doc/library/robotparser.rst
python/trunk/Doc/library/sched.rst
python/trunk/Doc/library/sgmllib.rst
python/trunk/Doc/library/shutil.rst
python/trunk/Doc/library/signal.rst
python/trunk/Doc/library/simplexmlrpcserver.rst
python/trunk/Doc/library/smtplib.rst
python/trunk/Doc/library/socket.rst
python/trunk/Doc/library/sqlite3.rst
python/trunk/Doc/library/ssl.rst
python/trunk/Doc/library/statvfs.rst
python/trunk/Doc/library/stdtypes.rst
python/trunk/Doc/library/string.rst
python/trunk/Doc/library/stringio.rst
python/trunk/Doc/library/subprocess.rst
python/trunk/Doc/library/sunaudio.rst
python/trunk/Doc/library/sys.rst
python/trunk/Doc/library/tk.rst
python/trunk/Doc/library/tkinter.rst
python/trunk/Doc/library/trace.rst
python/trunk/Doc/library/traceback.rst
python/trunk/Doc/library/turtle.rst
python/trunk/Doc/library/undoc.rst
python/trunk/Doc/library/unicodedata.rst
python/trunk/Doc/library/unittest.rst
python/trunk/Doc/library/urllib.rst
python/trunk/Doc/library/urllib2.rst
python/trunk/Doc/library/warnings.rst
python/trunk/Doc/library/webbrowser.rst
python/trunk/Doc/library/wsgiref.rst
python/trunk/Doc/library/xml.etree.elementtree.rst
python/trunk/Doc/library/zipfile.rst
python/trunk/Doc/library/zipimport.rst
python/trunk/Doc/license.rst
python/trunk/Doc/reference/expressions.rst
python/trunk/Doc/reference/lexical_analysis.rst
python/trunk/Doc/reference/simple_stmts.rst
python/trunk/Doc/tutorial/classes.rst
python/trunk/Doc/tutorial/controlflow.rst
python/trunk/Doc/tutorial/datastructures.rst
python/trunk/Doc/tutorial/errors.rst
python/trunk/Doc/tutorial/index.rst
python/trunk/Doc/tutorial/inputoutput.rst
python/trunk/Doc/tutorial/interpreter.rst
python/trunk/Doc/tutorial/introduction.rst
python/trunk/Doc/tutorial/modules.rst
python/trunk/Doc/tutorial/stdlib.rst
python/trunk/Doc/tutorial/whatnow.rst
python/trunk/Doc/using/cmdline.rst
python/trunk/Doc/using/unix.rst
python/trunk/Doc/using/windows.rst
python/trunk/Doc/whatsnew/2.0.rst
python/trunk/Doc/whatsnew/2.1.rst
python/trunk/Doc/whatsnew/2.2.rst
python/trunk/Doc/whatsnew/2.3.rst
python/trunk/Doc/whatsnew/2.4.rst
python/trunk/Doc/whatsnew/2.5.rst
python/trunk/Doc/whatsnew/2.6.rst
Modified: python/trunk/Doc/c-api/buffer.rst
==============================================================================
--- python/trunk/Doc/c-api/buffer.rst (original)
+++ python/trunk/Doc/c-api/buffer.rst Sat Jan 3 21:55:06 2009
@@ -30,7 +30,7 @@
.. index:: single: PyBufferProcs
-More information on the buffer interface is provided in the section
+More information on the buffer interface is provided in the section
:ref:`buffer-structs`, under the description for :ctype:`PyBufferProcs`.
A "buffer object" is defined in the :file:`bufferobject.h` header (included by
Modified: python/trunk/Doc/c-api/conversion.rst
==============================================================================
--- python/trunk/Doc/c-api/conversion.rst (original)
+++ python/trunk/Doc/c-api/conversion.rst Sat Jan 3 21:55:06 2009
@@ -77,7 +77,7 @@
.. versionadded:: 2.4
-
+
.. cfunction:: double PyOS_ascii_atof(const char *nptr)
Convert a string to a :ctype:`double` in a locale-independent way.
@@ -86,7 +86,7 @@
See the Unix man page :manpage:`atof(2)` for details.
-
+
.. cfunction:: char * PyOS_stricmp(char *s1, char *s2)
Case insensitive comparison of strings. The function works almost
Modified: python/trunk/Doc/c-api/init.rst
==============================================================================
--- python/trunk/Doc/c-api/init.rst (original)
+++ python/trunk/Doc/c-api/init.rst Sat Jan 3 21:55:06 2009
@@ -902,7 +902,7 @@
Return a tuple of function call counts. There are constants defined for the
positions within the tuple:
-
+
+-------------------------------+-------+
| Name | Value |
+===============================+=======+
@@ -928,7 +928,7 @@
+-------------------------------+-------+
| :const:`PCALL_POP` | 10 |
+-------------------------------+-------+
-
+
:const:`PCALL_FAST_FUNCTION` means no argument tuple needs to be created.
:const:`PCALL_FASTER_FUNCTION` means that the fast-path frame setup code is used.
Modified: python/trunk/Doc/c-api/long.rst
==============================================================================
--- python/trunk/Doc/c-api/long.rst (original)
+++ python/trunk/Doc/c-api/long.rst Sat Jan 3 21:55:06 2009
@@ -126,7 +126,7 @@
Return a C :ctype:`long` representation of the contents of *pylong*. If
*pylong* is greater than :const:`LONG_MAX`, an :exc:`OverflowError` is raised
- and ``-1`` will be returned.
+ and ``-1`` will be returned.
.. cfunction:: Py_ssize_t PyLong_AsSsize_t(PyObject *pylong)
Modified: python/trunk/Doc/c-api/module.rst
==============================================================================
--- python/trunk/Doc/c-api/module.rst (original)
+++ python/trunk/Doc/c-api/module.rst Sat Jan 3 21:55:06 2009
@@ -106,7 +106,7 @@
.. cfunction:: int PyModule_AddIntMacro(PyObject *module, macro)
- Add an int constant to *module*. The name and the value are taken from
+ Add an int constant to *module*. The name and the value are taken from
*macro*. For example ``PyModule_AddConstant(module, AF_INET)`` adds the int
constant *AF_INET* with the value of *AF_INET* to *module*.
Return ``-1`` on error, ``0`` on success.
Modified: python/trunk/Doc/c-api/reflection.rst
==============================================================================
--- python/trunk/Doc/c-api/reflection.rst (original)
+++ python/trunk/Doc/c-api/reflection.rst Sat Jan 3 21:55:06 2009
@@ -15,7 +15,7 @@
Return a dictionary of the local variables in the current execution frame,
or *NULL* if no frame is currently executing.
-
+
.. cfunction:: PyObject* PyEval_GetGlobals()
Modified: python/trunk/Doc/c-api/sequence.rst
==============================================================================
--- python/trunk/Doc/c-api/sequence.rst (original)
+++ python/trunk/Doc/c-api/sequence.rst Sat Jan 3 21:55:06 2009
@@ -143,9 +143,9 @@
Return the underlying array of PyObject pointers. Assumes that *o* was returned
by :cfunc:`PySequence_Fast` and *o* is not *NULL*.
-
+
Note, if a list gets resized, the reallocation may relocate the items array.
- So, only use the underlying array pointer in contexts where the sequence
+ So, only use the underlying array pointer in contexts where the sequence
cannot change.
.. versionadded:: 2.4
Modified: python/trunk/Doc/c-api/set.rst
==============================================================================
--- python/trunk/Doc/c-api/set.rst (original)
+++ python/trunk/Doc/c-api/set.rst Sat Jan 3 21:55:06 2009
@@ -101,7 +101,7 @@
.. versionchanged:: 2.6
Now guaranteed to return a brand-new :class:`frozenset`. Formerly,
- frozensets of zero-length were a singleton. This got in the way of
+ frozensets of zero-length were a singleton. This got in the way of
building-up new frozensets with :meth:`PySet_Add`.
The following functions and macros are available for instances of :class:`set`
Modified: python/trunk/Doc/c-api/structures.rst
==============================================================================
--- python/trunk/Doc/c-api/structures.rst (original)
+++ python/trunk/Doc/c-api/structures.rst Sat Jan 3 21:55:06 2009
@@ -265,7 +265,7 @@
read-only access. Using :cmacro:`T_STRING` for :attr:`type` implies
:cmacro:`READONLY`. Only :cmacro:`T_OBJECT` and :cmacro:`T_OBJECT_EX` can be
deleted. (They are set to *NULL*).
-
+
.. cfunction:: PyObject* Py_FindMethod(PyMethodDef table[], PyObject *ob, char *name)
Modified: python/trunk/Doc/distutils/apiref.rst
==============================================================================
--- python/trunk/Doc/distutils/apiref.rst (original)
+++ python/trunk/Doc/distutils/apiref.rst Sat Jan 3 21:55:06 2009
@@ -104,7 +104,7 @@
| *package_dir* | A mapping of package to | a dictionary |
| | directory names | |
+--------------------+--------------------------------+-------------------------------------------------------------+
-
+
.. function:: run_setup(script_name[, script_args=None, stop_after='run'])
@@ -755,7 +755,7 @@
standard output, otherwise do nothing.
.. % \subsection{Compiler-specific modules}
-.. %
+.. %
.. % The following modules implement concrete subclasses of the abstract
.. % \class{CCompiler} class. They should not be instantiated directly, but should
.. % be created using \function{distutils.ccompiler.new_compiler()} factory
@@ -859,7 +859,7 @@
Macintosh. Needs work to support CW on Windows or Mac OS X.
.. % \subsection{Utility modules}
-.. %
+.. %
.. % The following modules all provide general utility functions. They haven't
.. % all been documented yet.
@@ -1110,13 +1110,13 @@
For MacOS X systems the OS version reflects the minimal version on which
binaries will run (that is, the value of ``MACOSX_DEPLOYMENT_TARGET``
- during the build of Python), not the OS version of the current system.
+ during the build of Python), not the OS version of the current system.
For universal binary builds on MacOS X the architecture value reflects
the univeral binary status instead of the architecture of the current
- processor. For 32-bit universal binaries the architecture is ``fat``,
- for 64-bit universal binaries the architecture is ``fat64``, and
- for 4-way universal binaries the architecture is ``universal``.
+ processor. For 32-bit universal binaries the architecture is ``fat``,
+ for 64-bit universal binaries the architecture is ``fat64``, and
+ for 4-way universal binaries the architecture is ``universal``.
Examples of returned values on MacOS X:
@@ -1693,7 +1693,7 @@
.. % todo
.. % \section{Distutils Commands}
-.. %
+.. %
.. % This part of Distutils implements the various Distutils commands, such
.. % as \code{build}, \code{install} \&c. Each command is implemented as a
.. % separate module, with the command name as the name of the module.
Modified: python/trunk/Doc/distutils/builtdist.rst
==============================================================================
--- python/trunk/Doc/distutils/builtdist.rst (original)
+++ python/trunk/Doc/distutils/builtdist.rst Sat Jan 3 21:55:06 2009
@@ -268,13 +268,13 @@
.. % \longprogramopt{spec-file} option; used in conjunction with
.. % \longprogramopt{spec-only}, this gives you an opportunity to customize
.. % the \file{.spec} file manually:
-.. %
+.. %
.. % \ begin{verbatim}
.. % > python setup.py bdist_rpm --spec-only
.. % # ...edit dist/FooBar-1.0.spec
.. % > python setup.py bdist_rpm --spec-file=dist/FooBar-1.0.spec
.. % \ end{verbatim}
-.. %
+.. %
.. % (Although a better way to do this is probably to override the standard
.. % \command{bdist\_rpm} command with one that writes whatever else you want
.. % to the \file{.spec} file.)
@@ -334,31 +334,31 @@
Cross-compiling on Windows
==========================
-Starting with Python 2.6, distutils is capable of cross-compiling between
-Windows platforms. In practice, this means that with the correct tools
+Starting with Python 2.6, distutils is capable of cross-compiling between
+Windows platforms. In practice, this means that with the correct tools
installed, you can use a 32bit version of Windows to create 64bit extensions
and vice-versa.
-To build for an alternate platform, specify the :option:`--plat-name` option
-to the build command. Valid values are currently 'win32', 'win-amd64' and
+To build for an alternate platform, specify the :option:`--plat-name` option
+to the build command. Valid values are currently 'win32', 'win-amd64' and
'win-ia64'. For example, on a 32bit version of Windows, you could execute::
python setup.py build --plat-name=win-amd64
-to build a 64bit version of your extension. The Windows Installers also
+to build a 64bit version of your extension. The Windows Installers also
support this option, so the command::
python setup.py build --plat-name=win-amd64 bdist_wininst
would create a 64bit installation executable on your 32bit version of Windows.
-To cross-compile, you must download the Python source code and cross-compile
+To cross-compile, you must download the Python source code and cross-compile
Python itself for the platform you are targetting - it is not possible from a
binary installtion of Python (as the .lib etc file for other platforms are
-not included.) In practice, this means the user of a 32 bit operating
-system will need to use Visual Studio 2008 to open the
-:file:`PCBuild/PCbuild.sln` solution in the Python source tree and build the
-"x64" configuration of the 'pythoncore' project before cross-compiling
+not included.) In practice, this means the user of a 32 bit operating
+system will need to use Visual Studio 2008 to open the
+:file:`PCBuild/PCbuild.sln` solution in the Python source tree and build the
+"x64" configuration of the 'pythoncore' project before cross-compiling
extensions is possible.
Note that by default, Visual Studio 2008 does not install 64bit compilers or
Modified: python/trunk/Doc/distutils/configfile.rst
==============================================================================
--- python/trunk/Doc/distutils/configfile.rst (original)
+++ python/trunk/Doc/distutils/configfile.rst Sat Jan 3 21:55:06 2009
@@ -63,7 +63,7 @@
--include-dirs (-I) list of directories to search for header files
--define (-D) C preprocessor macros to define
--undef (-U) C preprocessor macros to undefine
- --swig-opts list of SWIG command line options
+ --swig-opts list of SWIG command line options
[...]
Note that an option spelled :option:`--foo-bar` on the command-line is spelled
Modified: python/trunk/Doc/distutils/packageindex.rst
==============================================================================
--- python/trunk/Doc/distutils/packageindex.rst (original)
+++ python/trunk/Doc/distutils/packageindex.rst Sat Jan 3 21:55:06 2009
@@ -72,7 +72,7 @@
index-servers =
pypi
other
-
+
[pypi]
repository: <repository-url>
username: <username>
@@ -91,4 +91,4 @@
python setup.py register -r other
-
+
Modified: python/trunk/Doc/distutils/setupscript.rst
==============================================================================
--- python/trunk/Doc/distutils/setupscript.rst (original)
+++ python/trunk/Doc/distutils/setupscript.rst Sat Jan 3 21:55:06 2009
@@ -213,7 +213,7 @@
this::
setup(...,
- ext_modules=[Extension('_foo', ['foo.i'],
+ ext_modules=[Extension('_foo', ['foo.i'],
swig_opts=['-modern', '-I../include'])],
py_modules=['foo'],
)
Modified: python/trunk/Doc/documenting/markup.rst
==============================================================================
--- python/trunk/Doc/documenting/markup.rst (original)
+++ python/trunk/Doc/documenting/markup.rst Sat Jan 3 21:55:06 2009
@@ -508,7 +508,7 @@
curly braces to indicate a "variable" part, as in ``:file:``.
If you don't need the "variable part" indication, use the standard
- ````code```` instead.
+ ````code```` instead.
.. describe:: var
@@ -767,7 +767,7 @@
don't have to escape ``*`` or ``|`` characters.
-.. XXX describe optional first parameter
+.. XXX describe optional first parameter
The following is an example taken from the Python Reference Manual::
Modified: python/trunk/Doc/extending/building.rst
==============================================================================
--- python/trunk/Doc/extending/building.rst (original)
+++ python/trunk/Doc/extending/building.rst Sat Jan 3 21:55:06 2009
@@ -39,7 +39,7 @@
With this :file:`setup.py`, and a file :file:`demo.c`, running ::
- python setup.py build
+ python setup.py build
will compile :file:`demo.c`, and produce an extension module named ``demo`` in
the :file:`build` directory. Depending on the system, the module file will end
Modified: python/trunk/Doc/extending/extending.rst
==============================================================================
--- python/trunk/Doc/extending/extending.rst (original)
+++ python/trunk/Doc/extending/extending.rst Sat Jan 3 21:55:06 2009
@@ -471,7 +471,7 @@
:cfunc:`PyEval_CallObject`. This function has two arguments, both pointers to
arbitrary Python objects: the Python function, and the argument list. The
argument list must always be a tuple object, whose length is the number of
-arguments. To call the Python function with no arguments, pass in NULL, or
+arguments. To call the Python function with no arguments, pass in NULL, or
an empty tuple; to call it with one argument, pass a singleton tuple.
:cfunc:`Py_BuildValue` returns a tuple when its format string consists of zero
or more format codes between parentheses. For example::
@@ -510,7 +510,7 @@
if (result == NULL)
return NULL; /* Pass error back */
...use result...
- Py_DECREF(result);
+ Py_DECREF(result);
Depending on the desired interface to the Python callback function, you may also
have to provide an argument list to :cfunc:`PyEval_CallObject`. In some cases
@@ -535,7 +535,7 @@
the error check! Also note that strictly speaking this code is not complete:
:cfunc:`Py_BuildValue` may run out of memory, and this should be checked.
-You may also call a function with keyword arguments by using
+You may also call a function with keyword arguments by using
:cfunc:`PyEval_CallObjectWithKeywords`. As in the above example, we use
:cfunc:`Py_BuildValue` to construct the dictionary. ::
@@ -671,7 +671,7 @@
static PyObject *
keywdarg_parrot(PyObject *self, PyObject *args, PyObject *keywds)
- {
+ {
int voltage;
char *state = "a stiff";
char *action = "voom";
@@ -679,11 +679,11 @@
static char *kwlist[] = {"voltage", "state", "action", "type", NULL};
- if (!PyArg_ParseTupleAndKeywords(args, keywds, "i|sss", kwlist,
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "i|sss", kwlist,
&voltage, &state, &action, &type))
- return NULL;
+ return NULL;
- printf("-- This parrot wouldn't %s if you put %i Volts through it.\n",
+ printf("-- This parrot wouldn't %s if you put %i Volts through it.\n",
action, voltage);
printf("-- Lovely plumage, the %s -- It's %s!\n", type, state);
Modified: python/trunk/Doc/extending/newtypes.rst
==============================================================================
--- python/trunk/Doc/extending/newtypes.rst (original)
+++ python/trunk/Doc/extending/newtypes.rst Sat Jan 3 21:55:06 2009
@@ -1234,7 +1234,7 @@
of *NULL* is required.
.. XXX Descriptors need to be explained in more detail somewhere, but not here.
-
+
Descriptor objects have two handler functions which correspond to the
\member{tp_getattro} and \member{tp_setattro} handlers. The
\method{__get__()} handler is a function which is passed the descriptor,
Modified: python/trunk/Doc/extending/windows.rst
==============================================================================
--- python/trunk/Doc/extending/windows.rst (original)
+++ python/trunk/Doc/extending/windows.rst Sat Jan 3 21:55:06 2009
@@ -102,7 +102,7 @@
and it should call :cfunc:`Py_InitModule` with the string ``"spam"`` as its
first argument (use the minimal :file:`example.c` in this directory as a guide).
By convention, it lives in a file called :file:`spam.c` or :file:`spammodule.c`.
- The output file should be called :file:`spam.pyd` (in Release mode) or
+ The output file should be called :file:`spam.pyd` (in Release mode) or
:file:`spam_d.pyd` (in Debug mode). The extension :file:`.pyd` was chosen
to avoid confusion with a system library :file:`spam.dll` to which your module
could be a Python interface.
Modified: python/trunk/Doc/glossary.rst
==============================================================================
--- python/trunk/Doc/glossary.rst (original)
+++ python/trunk/Doc/glossary.rst Sat Jan 3 21:55:06 2009
@@ -11,7 +11,7 @@
``>>>``
The default Python prompt of the interactive shell. Often seen for code
examples which can be executed interactively in the interpreter.
-
+
``...``
The default Python prompt of the interactive shell when entering code for
an indented code block or within a pair of matching left and right
@@ -50,11 +50,11 @@
A value associated with an object which is referenced by name using
dotted expressions. For example, if an object *o* has an attribute
*a* it would be referenced as *o.a*.
-
+
BDFL
Benevolent Dictator For Life, a.k.a. `Guido van Rossum
<http://www.python.org/~guido/>`_, Python's creator.
-
+
bytecode
Python source code is compiled into bytecode, the internal representation
of a Python program in the interpreter. The bytecode is also cached in
@@ -67,11 +67,11 @@
A template for creating user-defined objects. Class definitions
normally contain method definitions which operate on instances of the
class.
-
+
classic class
Any class which does not inherit from :class:`object`. See
:term:`new-style class`. Classic classes will be removed in Python 3.0.
-
+
coercion
The implicit conversion of an instance of one type to another during an
operation which involves two arguments of the same type. For example,
@@ -84,7 +84,7 @@
``operator.add(3.0, 4.5)``. Without coercion, all arguments of even
compatible types would have to be normalized to the same value by the
programmer, e.g., ``float(3)+4.5`` rather than just ``3+4.5``.
-
+
complex number
An extension of the familiar real number system in which all numbers are
expressed as a sum of a real part and an imaginary part. Imaginary
@@ -96,7 +96,7 @@
:mod:`math` module, use :mod:`cmath`. Use of complex numbers is a fairly
advanced mathematical feature. If you're not aware of a need for them,
it's almost certain you can safely ignore them.
-
+
context manager
An object which controls the environment seen in a :keyword:`with`
statement by defining :meth:`__enter__` and :meth:`__exit__` methods.
@@ -138,7 +138,7 @@
class methods, static methods, and reference to super classes.
For more information about descriptors' methods, see :ref:`descriptors`.
-
+
dictionary
An associative array, where arbitrary keys are mapped to values. The use
of :class:`dict` closely resembles that for :class:`list`, but the keys can
@@ -152,8 +152,8 @@
of the enclosing class, function or module. Since it is available via
introspection, it is the canonical place for documentation of the
object.
-
- duck-typing
+
+ duck-typing
A pythonic programming style which determines an object's type by inspection
of its method or attribute signature rather than by explicit relationship
to some type object ("If it looks like a duck and quacks like a duck, it
@@ -163,13 +163,13 @@
:func:`isinstance`. (Note, however, that duck-typing can be complemented
with abstract base classes.) Instead, it typically employs :func:`hasattr`
tests or :term:`EAFP` programming.
-
+
EAFP
Easier to ask for forgiveness than permission. This common Python coding
style assumes the existence of valid keys or attributes and catches
exceptions if the assumption proves false. This clean and fast style is
characterized by the presence of many :keyword:`try` and :keyword:`except`
- statements. The technique contrasts with the :term:`LBYL` style
+ statements. The technique contrasts with the :term:`LBYL` style
common to many other languages such as C.
expression
@@ -195,14 +195,14 @@
which are not compatible with the current interpreter. For example, the
expression ``11/4`` currently evaluates to ``2``. If the module in which
it is executed had enabled *true division* by executing::
-
+
from __future__ import division
-
+
the expression ``11/4`` would evaluate to ``2.75``. By importing the
:mod:`__future__` module and evaluating its variables, you can see when a
new feature was first added to the language and when it will become the
default::
-
+
>>> import __future__
>>> __future__.division
_Feature((2, 2, 0, 'alpha', 2), (3, 0, 0, 'alpha', 0), 8192)
@@ -211,7 +211,7 @@
The process of freeing memory when it is not used anymore. Python
performs garbage collection via reference counting and a cyclic garbage
collector that is able to detect and break reference cycles.
-
+
generator
A function which returns an iterator. It looks like a normal function
except that values are returned to the caller using a :keyword:`yield`
@@ -221,21 +221,21 @@
stopped at the :keyword:`yield` keyword (returning the result) and is
resumed there when the next element is requested by calling the
:meth:`next` method of the returned iterator.
-
+
.. index:: single: generator expression
-
+
generator expression
An expression that returns a generator. It looks like a normal expression
followed by a :keyword:`for` expression defining a loop variable, range,
and an optional :keyword:`if` expression. The combined expression
generates values for an enclosing function::
-
+
>>> sum(i*i for i in range(10)) # sum of squares 0, 1, 4, ... 81
285
-
+
GIL
See :term:`global interpreter lock`.
-
+
global interpreter lock
The lock used by Python threads to assure that only one thread
executes in the :term:`CPython` :term:`virtual machine` at a time.
@@ -261,21 +261,21 @@
containers (such as lists or dictionaries) are. Objects which are
instances of user-defined classes are hashable by default; they all
compare unequal, and their hash value is their :func:`id`.
-
+
IDLE
An Integrated Development Environment for Python. IDLE is a basic editor
and interpreter environment which ships with the standard distribution of
Python. Good for beginners, it also serves as clear example code for
those wanting to implement a moderately sophisticated, multi-platform GUI
application.
-
+
immutable
An object with a fixed value. Immutable objects include numbers, strings and
tuples. Such an object cannot be altered. A new object has to
be created if a different value has to be stored. They play an important
role in places where a constant hash value is needed, for example as a key
in a dictionary.
-
+
integer division
Mathematical division discarding any remainder. For example, the
expression ``11/4`` currently evaluates to ``2`` in contrast to the
@@ -287,7 +287,7 @@
divided by a float will result in a float value, possibly with a decimal
fraction. Integer division can be forced by using the ``//`` operator
instead of the ``/`` operator. See also :term:`__future__`.
-
+
interactive
Python has an interactive interpreter which means you can enter
statements and expressions at the interpreter prompt, immediately
@@ -295,7 +295,7 @@
arguments (possibly by selecting it from your computer's main
menu). It is a very powerful way to test out new ideas or inspect
modules and packages (remember ``help(x)``).
-
+
interpreted
Python is an interpreted language, as opposed to a compiled one,
though the distinction can be blurry because of the presence of the
@@ -304,7 +304,7 @@
Interpreted languages typically have a shorter development/debug cycle
than compiled ones, though their programs generally also run more
slowly. See also :term:`interactive`.
-
+
iterable
A container object capable of returning its members one at a
time. Examples of iterables include all sequence types (such as
@@ -320,7 +320,7 @@
statement does that automatically for you, creating a temporary unnamed
variable to hold the iterator for the duration of the loop. See also
:term:`iterator`, :term:`sequence`, and :term:`generator`.
-
+
iterator
An object representing a stream of data. Repeated calls to the iterator's
:meth:`next` method return successive items in the stream. When no more
@@ -335,7 +335,7 @@
:func:`iter` function or use it in a :keyword:`for` loop. Attempting this
with an iterator will just return the same exhausted iterator object used
in the previous iteration pass, making it appear like an empty container.
-
+
More information can be found in :ref:`typeiter`.
keyword argument
@@ -359,7 +359,7 @@
A built-in Python :term:`sequence`. Despite its name it is more akin
to an array in other languages than to a linked list since access to
elements are O(1).
-
+
list comprehension
A compact way to process all or part of the elements in a sequence and
return a list with the results. ``result = ["0x%02x" % x for x in
@@ -367,11 +367,11 @@
even hex numbers (0x..) in the range from 0 to 255. The :keyword:`if`
clause is optional. If omitted, all elements in ``range(256)`` are
processed.
-
+
mapping
A container object (such as :class:`dict`) which supports arbitrary key
lookups using the special method :meth:`__getitem__`.
-
+
metaclass
The class of a class. Class definitions create a class name, a class
dictionary, and a list of base classes. The metaclass is responsible for
@@ -390,7 +390,7 @@
of an instance of that class, the method will get the instance object as
its first :term:`argument` (which is usually called ``self``).
See :term:`function` and :term:`nested scope`.
-
+
mutable
Mutable objects can change their value but keep their :func:`id`. See
also :term:`immutable`.
@@ -407,7 +407,7 @@
:func:`collections.namedtuple`. The latter approach automatically
provides extra features such as a self-documenting representation like
``Employee(name='jones', title='programmer')``.
-
+
namespace
The place where a variable is stored. Namespaces are implemented as
dictionaries. There are the local, global and builtin namespaces as well
@@ -419,7 +419,7 @@
:func:`random.seed` or :func:`itertools.izip` makes it clear that those
functions are implemented by the :mod:`random` and :mod:`itertools`
modules, respectively.
-
+
nested scope
The ability to refer to a variable in an enclosing definition. For
instance, a function defined inside another function can refer to
@@ -427,7 +427,7 @@
reference and not for assignment which will always write to the innermost
scope. In contrast, local variables both read and write in the innermost
scope. Likewise, global variables read and write to the global namespace.
-
+
new-style class
Any class which inherits from :class:`object`. This includes all built-in
types like :class:`list` and :class:`dict`. Only new-style classes can
@@ -440,7 +440,7 @@
Any data with state (attributes or value) and defined behavior
(methods). Also the ultimate base class of any :term:`new-style
class`.
-
+
positional argument
The arguments assigned to local names inside a function or method,
determined by the order in which they were given in the call. ``*`` is
@@ -448,7 +448,7 @@
definition), or pass several arguments as a list to a function. See
:term:`argument`.
- Python 3000
+ Python 3000
Nickname for the next major Python version, 3.0 (coined long ago
when the release of version 3 was something in the distant future.) This
is also abbreviated "Py3k".
@@ -460,7 +460,7 @@
to loop over all elements of an iterable using a :keyword:`for`
statement. Many other languages don't have this type of construct, so
people unfamiliar with Python sometimes use a numerical counter instead::
-
+
for i in range(len(food)):
print food[i]
@@ -483,7 +483,7 @@
dictionaries. Though popular, the technique is somewhat tricky to get
right and is best reserved for rare cases where there are large numbers of
instances in a memory-critical application.
-
+
sequence
An :term:`iterable` which supports efficient element access using integer
indices via the :meth:`__getitem__` special method and defines a
@@ -529,7 +529,7 @@
virtual machine
A computer defined entirely in software. Python's virtual machine
executes the :term:`bytecode` emitted by the bytecode compiler.
-
+
Zen of Python
Listing of Python design principles and philosophies that are helpful in
understanding and using the language. The listing can be found by typing
Modified: python/trunk/Doc/howto/curses.rst
==============================================================================
--- python/trunk/Doc/howto/curses.rst (original)
+++ python/trunk/Doc/howto/curses.rst Sat Jan 3 21:55:06 2009
@@ -399,8 +399,8 @@
curses.echo() # Enable echoing of characters
- # Get a 15-character string, with the cursor on the top line
- s = stdscr.getstr(0,0, 15)
+ # Get a 15-character string, with the cursor on the top line
+ s = stdscr.getstr(0,0, 15)
The Python :mod:`curses.textpad` module supplies something better. With it, you
can turn a window into a text box that supports an Emacs-like set of
Modified: python/trunk/Doc/howto/doanddont.rst
==============================================================================
--- python/trunk/Doc/howto/doanddont.rst (original)
+++ python/trunk/Doc/howto/doanddont.rst Sat Jan 3 21:55:06 2009
@@ -1,5 +1,5 @@
************************************
- Idioms and Anti-Idioms in Python
+ Idioms and Anti-Idioms in Python
************************************
:Author: Moshe Zadka
@@ -127,7 +127,7 @@
# bar.py
from foo import a
if something():
- a = 2 # danger: foo.a != a
+ a = 2 # danger: foo.a != a
Good example::
@@ -303,6 +303,6 @@
This version is bulletproof::
- value = (foo.bar()['first'][0]*baz.quux(1, 2)[5:9]
+ value = (foo.bar()['first'][0]*baz.quux(1, 2)[5:9]
+ calculate_number(10, 20)*forbulate(500, 360))
Modified: python/trunk/Doc/howto/functional.rst
==============================================================================
--- python/trunk/Doc/howto/functional.rst (original)
+++ python/trunk/Doc/howto/functional.rst Sat Jan 3 21:55:06 2009
@@ -145,7 +145,7 @@
functions are also easier to read and to check for errors.
-Ease of debugging and testing
+Ease of debugging and testing
-----------------------------
Testing and debugging a functional-style program is easier.
@@ -213,7 +213,7 @@
Traceback (most recent call last):
File "<stdin>", line 1, in ?
StopIteration
- >>>
+ >>>
Python expects iterable objects in several different contexts, the most
important being the ``for`` statement. In the statement ``for X in Y``, Y must
@@ -362,7 +362,7 @@
comprehensions are surrounded by square brackets ("[]"). Generator expressions
have the form::
- ( expression for expr in sequence1
+ ( expression for expr in sequence1
if condition1
for expr2 in sequence2
if condition2
@@ -404,7 +404,7 @@
if not (conditionN):
continue # Skip this element
- # Output the value of
+ # Output the value of
# the expression.
This means that when there are multiple ``for...in`` clauses but no ``if``
@@ -418,8 +418,8 @@
>>> seq1 = 'abc'
>>> seq2 = (1,2,3)
>>> [(x,y) for x in seq1 for y in seq2]
- [('a', 1), ('a', 2), ('a', 3),
- ('b', 1), ('b', 2), ('b', 3),
+ [('a', 1), ('a', 2), ('a', 3),
+ ('b', 1), ('b', 2), ('b', 3),
('c', 1), ('c', 2), ('c', 3)]
To avoid introducing an ambiguity into Python's grammar, if ``expression`` is
@@ -759,7 +759,7 @@
True
>>> all([0,1,0])
False
- >>> all([0,0,0])
+ >>> all([0,0,0])
False
>>> all([1,1,1])
True
@@ -845,7 +845,7 @@
4) Convert the lambda to a def statement, using that name.
5) Remove the comment.
-I really like these rules, but you're free to disagree
+I really like these rules, but you're free to disagree
about whether this lambda-free style is better.
@@ -970,7 +970,7 @@
``itertools.starmap(func, iter)`` assumes that the iterable will return a stream
of tuples, and calls ``f()`` using these tuples as the arguments::
- itertools.starmap(os.path.join,
+ itertools.starmap(os.path.join,
[('/usr', 'bin', 'java'), ('/bin', 'python'),
('/usr', 'bin', 'perl'),('/usr', 'bin', 'ruby')])
=>
@@ -1039,9 +1039,9 @@
::
- city_list = [('Decatur', 'AL'), ('Huntsville', 'AL'), ('Selma', 'AL'),
+ city_list = [('Decatur', 'AL'), ('Huntsville', 'AL'), ('Selma', 'AL'),
('Anchorage', 'AK'), ('Nome', 'AK'),
- ('Flagstaff', 'AZ'), ('Phoenix', 'AZ'), ('Tucson', 'AZ'),
+ ('Flagstaff', 'AZ'), ('Phoenix', 'AZ'), ('Tucson', 'AZ'),
...
]
@@ -1056,7 +1056,7 @@
where
iterator-1 =>
('Decatur', 'AL'), ('Huntsville', 'AL'), ('Selma', 'AL')
- iterator-2 =>
+ iterator-2 =>
('Anchorage', 'AK'), ('Nome', 'AK')
iterator-3 =>
('Flagstaff', 'AZ'), ('Phoenix', 'AZ'), ('Tucson', 'AZ')
@@ -1150,7 +1150,7 @@
>>> double(add(5, 6))
22
-
+
The ``unpack`` keyword is provided to work around the fact that Python functions
are not always `fully curried <http://en.wikipedia.org/wiki/Currying>`__. By
default, it is expected that the ``inner`` function will return a single object
@@ -1159,15 +1159,15 @@
will be expanded before being passed to ``outer``. Put simply, ::
compose(f, g)(5, 6)
-
+
is equivalent to::
f(g(5, 6))
-
+
while ::
compose(f, g, unpack=True)(5, 6)
-
+
is equivalent to::
f(*g(5, 6))
@@ -1178,20 +1178,20 @@
``functional`` and ``functools``). ::
from functional import compose, partial
-
+
multi_compose = partial(reduce, compose)
-
-
+
+
We can also use ``map()``, ``compose()`` and ``partial()`` to craft a version of
``"".join(...)`` that converts its arguments to string::
from functional import compose, partial
-
+
join = compose("".join, partial(map, str))
``flip(func)``
-
+
``flip()`` wraps the callable in ``func`` and causes it to receive its
non-keyword arguments in reverse order. ::
@@ -1206,7 +1206,7 @@
(7, 6, 5)
``foldl(func, start, iterable)``
-
+
``foldl()`` takes a binary function, a starting value (usually some kind of
'zero'), and an iterable. The function is applied to the starting value and the
first element of the list, then the result of that and the second element of the
@@ -1220,7 +1220,7 @@
f(f(f(0, 1), 2), 3)
-
+
``foldl()`` is roughly equivalent to the following recursive function::
def foldl(func, start, seq):
@@ -1298,7 +1298,7 @@
Text Processing".
Mertz also wrote a 3-part series of articles on functional programming
-for IBM's DeveloperWorks site; see
+for IBM's DeveloperWorks site; see
`part 1 <http://www-128.ibm.com/developerworks/library/l-prog.html>`__,
`part 2 <http://www-128.ibm.com/developerworks/library/l-prog2.html>`__, and
`part 3 <http://www-128.ibm.com/developerworks/linux/library/l-prog3.html>`__,
Modified: python/trunk/Doc/howto/regex.rst
==============================================================================
--- python/trunk/Doc/howto/regex.rst (original)
+++ python/trunk/Doc/howto/regex.rst Sat Jan 3 21:55:06 2009
@@ -1,7 +1,7 @@
.. _regex-howto:
****************************
- Regular Expression HOWTO
+ Regular Expression HOWTO
****************************
:Author: A.M. Kuchling
@@ -611,7 +611,7 @@
is to read? ::
charref = re.compile(r"""
- &[#] # Start of a numeric entity reference
+ &[#] # Start of a numeric entity reference
(
0[0-7]+ # Octal form
| [0-9]+ # Decimal form
@@ -732,7 +732,7 @@
>>> p = re.compile('\bclass\b')
>>> print p.search('no class at all')
None
- >>> print p.search('\b' + 'class' + '\b')
+ >>> print p.search('\b' + 'class' + '\b')
<re.MatchObject instance at 80c3ee0>
Second, inside a character class, where there's no use for this assertion,
@@ -1236,9 +1236,9 @@
only report a successful match which will start at 0; if the match wouldn't
start at zero, :func:`match` will *not* report it. ::
- >>> print re.match('super', 'superstition').span()
+ >>> print re.match('super', 'superstition').span()
(0, 5)
- >>> print re.match('super', 'insuperable')
+ >>> print re.match('super', 'insuperable')
None
On the other hand, :func:`search` will scan forward through the string,
Modified: python/trunk/Doc/howto/sockets.rst
==============================================================================
--- python/trunk/Doc/howto/sockets.rst (original)
+++ python/trunk/Doc/howto/sockets.rst Sat Jan 3 21:55:06 2009
@@ -1,5 +1,5 @@
****************************
- Socket Programming HOWTO
+ Socket Programming HOWTO
****************************
:Author: Gordon McMillan
@@ -63,7 +63,7 @@
#create an INET, STREAMing socket
s = socket.socket(
socket.AF_INET, socket.SOCK_STREAM)
- #now connect to the web server on port 80
+ #now connect to the web server on port 80
# - the normal http port
s.connect(("www.mcmillan-inc.com", 80))
@@ -78,7 +78,7 @@
#create an INET, STREAMing socket
serversocket = socket.socket(
socket.AF_INET, socket.SOCK_STREAM)
- #bind the socket to a public host,
+ #bind the socket to a public host,
# and a well-known port
serversocket.bind((socket.gethostname(), 80))
#become a server socket
@@ -185,7 +185,7 @@
length message::
class mysocket:
- '''demonstration class only
+ '''demonstration class only
- coded for clarity, not efficiency
'''
@@ -343,9 +343,9 @@
ready_to_read, ready_to_write, in_error = \
select.select(
- potential_readers,
- potential_writers,
- potential_errs,
+ potential_readers,
+ potential_writers,
+ potential_errs,
timeout)
You pass ``select`` three lists: the first contains all sockets that you might
Modified: python/trunk/Doc/howto/unicode.rst
==============================================================================
--- python/trunk/Doc/howto/unicode.rst (original)
+++ python/trunk/Doc/howto/unicode.rst Sat Jan 3 21:55:06 2009
@@ -122,8 +122,8 @@
representation, the string "Python" would look like this::
P y t h o n
- 0x50 00 00 00 79 00 00 00 74 00 00 00 68 00 00 00 6f 00 00 00 6e 00 00 00
- 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
+ 0x50 00 00 00 79 00 00 00 74 00 00 00 68 00 00 00 6f 00 00 00 6e 00 00 00
+ 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
This representation is straightforward but using it presents a number of
problems.
@@ -181,7 +181,7 @@
between 128 and 255.
3. Code points >0x7ff are turned into three- or four-byte sequences, where each
byte of the sequence is between 128 and 255.
-
+
UTF-8 has several convenient properties:
1. It can handle any Unicode code point.
@@ -252,7 +252,7 @@
>>> unicode('abcdef' + chr(255))
Traceback (most recent call last):
File "<stdin>", line 1, in ?
- UnicodeDecodeError: 'ascii' codec can't decode byte 0xff in position 6:
+ UnicodeDecodeError: 'ascii' codec can't decode byte 0xff in position 6:
ordinal not in range(128)
The ``errors`` argument specifies the response when the input string can't be
@@ -264,7 +264,7 @@
>>> unicode('\x80abc', errors='strict')
Traceback (most recent call last):
File "<stdin>", line 1, in ?
- UnicodeDecodeError: 'ascii' codec can't decode byte 0x80 in position 0:
+ UnicodeDecodeError: 'ascii' codec can't decode byte 0x80 in position 0:
ordinal not in range(128)
>>> unicode('\x80abc', errors='replace')
u'\ufffdabc'
@@ -350,7 +350,7 @@
>>> u2 = utf8_version.decode('utf-8') # Decode using UTF-8
>>> u == u2 # The two strings match
True
-
+
The low-level routines for registering and accessing the available encodings are
found in the :mod:`codecs` module. However, the encoding and decoding functions
returned by this module are usually more low-level than is comfortable, so I'm
@@ -362,8 +362,8 @@
The most commonly used part of the :mod:`codecs` module is the
:func:`codecs.open` function which will be discussed in the section on input and
output.
-
-
+
+
Unicode Literals in Python Source Code
--------------------------------------
@@ -381,10 +381,10 @@
>>> s = u"a\xac\u1234\u20ac\U00008000"
^^^^ two-digit hex escape
- ^^^^^^ four-digit Unicode escape
+ ^^^^^^ four-digit Unicode escape
^^^^^^^^^^ eight-digit Unicode escape
>>> for c in s: print ord(c),
- ...
+ ...
97 172 4660 8364 32768
Using escape sequences for code points greater than 127 is fine in small doses,
@@ -404,10 +404,10 @@
#!/usr/bin/env python
# -*- coding: latin-1 -*-
-
+
u = u'abcdé'
print ord(u[-1])
-
+
The syntax is inspired by Emacs's notation for specifying variables local to a
file. Emacs supports many different variables, but Python only supports
'coding'. The ``-*-`` symbols indicate to Emacs that the comment is special;
@@ -427,10 +427,10 @@
When you run it with Python 2.4, it will output the following warning::
amk:~$ python p263.py
- sys:1: DeprecationWarning: Non-ASCII character '\xe9'
- in file p263.py on line 2, but no encoding declared;
+ sys:1: DeprecationWarning: Non-ASCII character '\xe9'
+ in file p263.py on line 2, but no encoding declared;
see http://www.python.org/peps/pep-0263.html for details
-
+
Unicode Properties
------------------
@@ -446,13 +446,13 @@
prints the numeric value of one particular character::
import unicodedata
-
+
u = unichr(233) + unichr(0x0bf2) + unichr(3972) + unichr(6000) + unichr(13231)
-
+
for i, c in enumerate(u):
print i, '%04x' % ord(c), unicodedata.category(c),
print unicodedata.name(c)
-
+
# Get numeric value of second character
print unicodedata.numeric(u[1])
@@ -615,7 +615,7 @@
the Unicode versions.
-
+
Tips for Writing Unicode-aware Programs
---------------------------------------
@@ -661,7 +661,7 @@
unicode_name = filename.decode(encoding)
f = open(unicode_name, 'r')
# ... return contents of file ...
-
+
However, if an attacker could specify the ``'base64'`` encoding, they could pass
``'L2V0Yy9wYXNzd2Q='``, which is the base-64 encoded form of the string
``'/etc/passwd'``, to read a system file. The above code looks for ``'/'``
@@ -697,7 +697,7 @@
.. comment Describe obscure -U switch somewhere?
.. comment Describe use of codecs.StreamRecoder and StreamReaderWriter
-.. comment
+.. comment
Original outline:
- [ ] Unicode introduction
Modified: python/trunk/Doc/howto/urllib2.rst
==============================================================================
--- python/trunk/Doc/howto/urllib2.rst (original)
+++ python/trunk/Doc/howto/urllib2.rst Sat Jan 3 21:55:06 2009
@@ -10,7 +10,7 @@
HOWTO, available at `urllib2 - Le Manuel manquant
<http://www.voidspace.org.uk/python/articles/urllib2_francais.shtml>`_.
-
+
Introduction
============
@@ -19,9 +19,9 @@
You may also find useful the following article on fetching web resources
with Python :
-
+
* `Basic Authentication <http://www.voidspace.org.uk/python/articles/authentication.shtml>`_
-
+
A tutorial on *Basic Authentication*, with examples in Python.
**urllib2** is a `Python <http://www.python.org>`_ module for fetching URLs
@@ -98,7 +98,7 @@
*not* from ``urllib2``. ::
import urllib
- import urllib2
+ import urllib2
url = 'http://www.someserver.com/cgi-bin/register.cgi'
values = {'name' : 'Michael Foord',
@@ -161,15 +161,15 @@
Explorer [#]_. ::
import urllib
- import urllib2
-
+ import urllib2
+
url = 'http://www.someserver.com/cgi-bin/register.cgi'
- user_agent = 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'
+ user_agent = 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'
values = {'name' : 'Michael Foord',
'location' : 'Northampton',
'language' : 'Python' }
headers = { 'User-Agent' : user_agent }
-
+
data = urllib.urlencode(values)
req = urllib2.Request(url, data, headers)
response = urllib2.urlopen(req)
@@ -183,7 +183,7 @@
===================
*urlopen* raises :exc:`URLError` when it cannot handle a response (though as usual
-with Python APIs, builtin exceptions such as
+with Python APIs, builtin exceptions such as
:exc:`ValueError`, :exc:`TypeError` etc. may also
be raised).
@@ -309,18 +309,18 @@
geturl, and info, methods. ::
>>> req = urllib2.Request('http://www.python.org/fish.html')
- >>> try:
+ >>> try:
>>> urllib2.urlopen(req)
>>> except URLError, e:
>>> print e.code
>>> print e.read()
- >>>
+ >>>
404
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
- <?xml-stylesheet href="./css/ht2html.css"
+ <?xml-stylesheet href="./css/ht2html.css"
type="text/css"?>
- <html><head><title>Error 404: File Not Found</title>
+ <html><head><title>Error 404: File Not Found</title>
...... etc...
Wrapping it Up
@@ -372,7 +372,7 @@
print 'Error code: ', e.code
else:
# everything is fine
-
+
info and geturl
===============
@@ -443,7 +443,7 @@
and a 'realm'. The header looks like : ``Www-authenticate: SCHEME
realm="REALM"``.
-e.g. ::
+e.g. ::
Www-authenticate: Basic realm="cPanel Users"
@@ -467,24 +467,24 @@
than the URL you pass to .add_password() will also match. ::
# create a password manager
- password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
+ password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
# Add the username and password.
# If we knew the realm, we could use it instead of None.
top_level_url = "http://example.com/foo/"
password_mgr.add_password(None, top_level_url, username, password)
- handler = urllib2.HTTPBasicAuthHandler(password_mgr)
+ handler = urllib2.HTTPBasicAuthHandler(password_mgr)
# create "opener" (OpenerDirector instance)
- opener = urllib2.build_opener(handler)
+ opener = urllib2.build_opener(handler)
# use the opener to fetch a URL
- opener.open(a_url)
+ opener.open(a_url)
# Install the opener.
# Now all calls to urllib2.urlopen use our opener.
- urllib2.install_opener(opener)
+ urllib2.install_opener(opener)
.. note::
@@ -540,7 +540,7 @@
# timeout in seconds
timeout = 10
- socket.setdefaulttimeout(timeout)
+ socket.setdefaulttimeout(timeout)
# this call to urllib2.urlopen now uses the default timeout
# we have set in the socket module
@@ -557,7 +557,7 @@
This document was reviewed and revised by John Lee.
.. [#] For an introduction to the CGI protocol see
- `Writing Web Applications in Python <http://www.pyzine.com/Issue008/Section_Articles/article_CGIOne.html>`_.
+ `Writing Web Applications in Python <http://www.pyzine.com/Issue008/Section_Articles/article_CGIOne.html>`_.
.. [#] Like Google for example. The *proper* way to use google from a program
is to use `PyGoogle <http://pygoogle.sourceforge.net>`_ of course. See
`Voidspace Google <http://www.voidspace.org.uk/python/recipebook.shtml#google>`_
@@ -574,6 +574,6 @@
is set to use the proxy, which urllib2 picks up on. In order to test
scripts with a localhost server, I have to prevent urllib2 from using
the proxy.
-.. [#] urllib2 opener for SSL proxy (CONNECT method): `ASPN Cookbook Recipe
+.. [#] urllib2 opener for SSL proxy (CONNECT method): `ASPN Cookbook Recipe
<http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/456195>`_.
-
+
Modified: python/trunk/Doc/howto/webservers.rst
==============================================================================
--- python/trunk/Doc/howto/webservers.rst (original)
+++ python/trunk/Doc/howto/webservers.rst Sat Jan 3 21:55:06 2009
@@ -88,7 +88,7 @@
<http://wiki.python.org/moin/CgiScripts>`_ with some additional information
about CGI in Python.
-
+
Simple script for testing CGI
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -386,7 +386,7 @@
You might be interested in some WSGI-supporting modules already contained in
the standard library, namely:
-
+
* :mod:`wsgiref` -- some tiny utilities and servers for WSGI
@@ -499,7 +499,7 @@
time in looking through the most popular ones. Some frameworks have their
own template engine or have a recommentation for one. It's wise to use
these.
-
+
Popular template engines include:
* Mako
@@ -687,7 +687,7 @@
found in the Python wiki.
.. seealso::
-
+
The Python wiki contains an extensive list of `web frameworks
<http://wiki.python.org/moin/WebFrameworks>`_.
Modified: python/trunk/Doc/install/index.rst
==============================================================================
--- python/trunk/Doc/install/index.rst (original)
+++ python/trunk/Doc/install/index.rst Sat Jan 3 21:55:06 2009
@@ -3,7 +3,7 @@
.. _install-index:
*****************************
- Installing Python Modules
+ Installing Python Modules
*****************************
:Author: Greg Ward
@@ -18,7 +18,7 @@
Thus, I have to be sure to explain the basics at some point:
sys.path and PYTHONPATH at least. Should probably give pointers to
other docs on "import site", PYTHONSTARTUP, PYTHONHOME, etc.
-
+
Finally, it might be useful to include all the material from my "Care
and Feeding of a Python Installation" talk in here somewhere. Yow!
@@ -268,7 +268,7 @@
statements shown below, and get the output as shown, to find out my
:file:`{prefix}` and :file:`{exec-prefix}`::
- Python 2.4 (#26, Aug 7 2004, 17:19:02)
+ Python 2.4 (#26, Aug 7 2004, 17:19:02)
Type "help", "copyright", "credits" or "license" for more information.
>>> import sys
>>> sys.prefix
@@ -590,8 +590,8 @@
Type "help", "copyright", "credits" or "license" for more information.
>>> import sys
>>> sys.path
- ['', '/usr/local/lib/python2.3', '/usr/local/lib/python2.3/plat-linux2',
- '/usr/local/lib/python2.3/lib-tk', '/usr/local/lib/python2.3/lib-dynload',
+ ['', '/usr/local/lib/python2.3', '/usr/local/lib/python2.3/plat-linux2',
+ '/usr/local/lib/python2.3/lib-tk', '/usr/local/lib/python2.3/lib-dynload',
'/usr/local/lib/python2.3/site-packages']
>>>
Modified: python/trunk/Doc/library/abc.rst
==============================================================================
--- python/trunk/Doc/library/abc.rst (original)
+++ python/trunk/Doc/library/abc.rst Sat Jan 3 21:55:06 2009
@@ -130,7 +130,7 @@
A decorator indicating abstract methods.
Using this decorator requires that the class's metaclass is :class:`ABCMeta` or
- is derived from it.
+ is derived from it.
A class that has a metaclass derived from :class:`ABCMeta`
cannot be instantiated unless all of its abstract methods and
properties are overridden.
@@ -166,7 +166,7 @@
A subclass of the built-in :func:`property`, indicating an abstract property.
Using this function requires that the class's metaclass is :class:`ABCMeta` or
- is derived from it.
+ is derived from it.
A class that has a metaclass derived from :class:`ABCMeta` cannot be
instantiated unless all of its abstract methods and properties are overridden.
The abstract properties can be called using any of the normal
Modified: python/trunk/Doc/library/aifc.rst
==============================================================================
--- python/trunk/Doc/library/aifc.rst (original)
+++ python/trunk/Doc/library/aifc.rst Sat Jan 3 21:55:06 2009
@@ -17,7 +17,7 @@
ability to compress the audio data.
.. warning::
-
+
Some operations may only work under IRIX; these will raise :exc:`ImportError`
when attempting to import the :mod:`cl` module, which is only available on IRIX.
Modified: python/trunk/Doc/library/al.rst
==============================================================================
--- python/trunk/Doc/library/al.rst (original)
+++ python/trunk/Doc/library/al.rst Sat Jan 3 21:55:06 2009
@@ -6,7 +6,7 @@
:platform: IRIX
:synopsis: Audio functions on the SGI.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`al` module has been deprecated for removal in Python 3.0.
Modified: python/trunk/Doc/library/ast.rst
==============================================================================
--- python/trunk/Doc/library/ast.rst (original)
+++ python/trunk/Doc/library/ast.rst Sat Jan 3 21:55:06 2009
@@ -127,7 +127,7 @@
Parse an expression into an AST node. Equivalent to ``compile(expr,
filename, mode, ast.PyCF_ONLY_AST)``.
-
+
.. function:: literal_eval(node_or_string)
Safely evaluate an expression node or a string containing a Python
@@ -205,7 +205,7 @@
.. method:: generic_visit(node)
This visitor calls :meth:`visit` on all children of the node.
-
+
Note that child nodes of nodes that have a custom visitor method won't be
visited unless the visitor calls :meth:`generic_visit` or visits them
itself.
Modified: python/trunk/Doc/library/audioop.rst
==============================================================================
--- python/trunk/Doc/library/audioop.rst (original)
+++ python/trunk/Doc/library/audioop.rst Sat Jan 3 21:55:06 2009
@@ -265,7 +265,7 @@
in_test = inputdata[pos*2:]
ipos, factor = audioop.findfit(in_test, out_test)
# Optional (for better cancellation):
- # factor = audioop.findfactor(in_test[ipos*2:ipos*2+len(out_test)],
+ # factor = audioop.findfactor(in_test[ipos*2:ipos*2+len(out_test)],
# out_test)
prefill = '\0'*(pos+ipos)*2
postfill = '\0'*(len(inputdata)-len(prefill)-len(outputdata))
Modified: python/trunk/Doc/library/bastion.rst
==============================================================================
--- python/trunk/Doc/library/bastion.rst (original)
+++ python/trunk/Doc/library/bastion.rst Sat Jan 3 21:55:06 2009
@@ -5,10 +5,10 @@
.. module:: Bastion
:synopsis: Providing restricted access to objects.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`Bastion` module has been removed in Python 3.0.
-
+
.. moduleauthor:: Barry Warsaw <bwarsaw at python.org>
Modified: python/trunk/Doc/library/bdb.rst
==============================================================================
--- python/trunk/Doc/library/bdb.rst (original)
+++ python/trunk/Doc/library/bdb.rst Sat Jan 3 21:55:06 2009
@@ -325,7 +325,7 @@
Check whether we should break here, depending on the way the breakpoint *b*
was set.
-
+
If it was set via line number, it checks if ``b.line`` is the same as the one
in the frame also passed as argument. If the breakpoint was set via function
name, we have to check we are in the right frame (the right function) and if
@@ -335,7 +335,7 @@
Determine if there is an effective (active) breakpoint at this line of code.
Return breakpoint number or 0 if none.
-
+
Called only if we know there is a breakpoint at this location. Returns the
breakpoint that was triggered and a flag that indicates if it is ok to delete
a temporary breakpoint.
Modified: python/trunk/Doc/library/bsddb.rst
==============================================================================
--- python/trunk/Doc/library/bsddb.rst (original)
+++ python/trunk/Doc/library/bsddb.rst Sat Jan 3 21:55:06 2009
@@ -172,7 +172,7 @@
>>> import bsddb
>>> db = bsddb.btopen('/tmp/spam.db', 'c')
>>> for i in range(10): db['%d'%i] = '%d'% (i*i)
- ...
+ ...
>>> db['3']
'9'
>>> db.keys()
@@ -185,7 +185,7 @@
('9', '81')
>>> db.set_location('2')
('2', '4')
- >>> db.previous()
+ >>> db.previous()
('1', '1')
>>> for k, v in db.iteritems():
... print k, v
Modified: python/trunk/Doc/library/bz2.rst
==============================================================================
--- python/trunk/Doc/library/bz2.rst (original)
+++ python/trunk/Doc/library/bz2.rst Sat Jan 3 21:55:06 2009
@@ -93,7 +93,7 @@
performance optimizations previously implemented in the :mod:`xreadlines`
module.
- .. deprecated:: 2.3
+ .. deprecated:: 2.3
This exists only for compatibility with the method by this name on
:class:`file` objects, which is deprecated. Use ``for line in file``
instead.
Modified: python/trunk/Doc/library/cd.rst
==============================================================================
--- python/trunk/Doc/library/cd.rst (original)
+++ python/trunk/Doc/library/cd.rst Sat Jan 3 21:55:06 2009
@@ -6,8 +6,8 @@
:platform: IRIX
:synopsis: Interface to the CD-ROM on Silicon Graphics systems.
:deprecated:
-
-
+
+
.. deprecated:: 2.6
The :mod:`cd` module has been deprecated for removal in Python 3.0.
Modified: python/trunk/Doc/library/cmath.rst
==============================================================================
--- python/trunk/Doc/library/cmath.rst (original)
+++ python/trunk/Doc/library/cmath.rst Sat Jan 3 21:55:06 2009
@@ -70,9 +70,9 @@
.. function:: polar(x)
- Convert a :class:`complex` from rectangular coordinates to polar
+ Convert a :class:`complex` from rectangular coordinates to polar
coordinates. The function returns a tuple with the two elements
- *r* and *phi*. *r* is the distance from 0 and *phi* the phase
+ *r* and *phi*. *r* is the distance from 0 and *phi* the phase
angle.
.. versionadded:: 2.6
Modified: python/trunk/Doc/library/codeop.rst
==============================================================================
--- python/trunk/Doc/library/codeop.rst (original)
+++ python/trunk/Doc/library/codeop.rst Sat Jan 3 21:55:06 2009
@@ -43,7 +43,7 @@
other value will cause :exc:`ValueError` to be raised.
.. warning::
-
+
It is possible (but not likely) that the parser stops parsing with a
successful outcome before reaching the end of the source; in this case,
trailing symbols may be ignored instead of causing an error. For example,
Modified: python/trunk/Doc/library/collections.rst
==============================================================================
--- python/trunk/Doc/library/collections.rst (original)
+++ python/trunk/Doc/library/collections.rst Sat Jan 3 21:55:06 2009
@@ -55,34 +55,34 @@
:class:`Iterator` :class:`Iterable` ``__next__`` ``__iter__``
:class:`Sized` ``__len__``
:class:`Callable` ``__call__``
-
+
:class:`Sequence` :class:`Sized`, ``__getitem__`` ``__contains__``. ``__iter__``, ``__reversed__``.
:class:`Iterable`, and ``__len__`` ``index``, and ``count``
- :class:`Container`
-
+ :class:`Container`
+
:class:`MutableSequence` :class:`Sequence` ``__getitem__`` Inherited Sequence methods and
``__delitem__``, ``append``, ``reverse``, ``extend``, ``pop``,
``insert``, ``remove``, and ``__iadd__``
and ``__len__``
-
+
:class:`Set` :class:`Sized`, ``__len__``, ``__le__``, ``__lt__``, ``__eq__``, ``__ne__``,
:class:`Iterable`, ``__iter__``, and ``__gt__``, ``__ge__``, ``__and__``, ``__or__``
:class:`Container` ``__contains__`` ``__sub__``, ``__xor__``, and ``isdisjoint``
-
+
:class:`MutableSet` :class:`Set` ``add`` and Inherited Set methods and
``discard`` ``clear``, ``pop``, ``remove``, ``__ior__``,
``__iand__``, ``__ixor__``, and ``__isub__``
-
+
:class:`Mapping` :class:`Sized`, ``__getitem__``, ``__contains__``, ``keys``, ``items``, ``values``,
:class:`Iterable`, ``__len__``. and ``get``, ``__eq__``, and ``__ne__``
:class:`Container` ``__iter__``
-
+
:class:`MutableMapping` :class:`Mapping` ``__getitem__`` Inherited Mapping methods and
``__setitem__``, ``pop``, ``popitem``, ``clear``, ``update``,
``__delitem__``, and ``setdefault``
``__iter__``, and
``__len__``
-
+
:class:`MappingView` :class:`Sized` ``__len__``
:class:`KeysView` :class:`MappingView`, ``__contains__``,
:class:`Set` ``__iter__``
@@ -549,8 +549,8 @@
if kwds:
raise ValueError('Got unexpected field names: %r' % kwds.keys())
return result
- <BLANKLINE>
- def __getnewargs__(self):
+ <BLANKLINE>
+ def __getnewargs__(self):
return tuple(self)
<BLANKLINE>
x = property(itemgetter(0))
Modified: python/trunk/Doc/library/compiler.rst
==============================================================================
--- python/trunk/Doc/library/compiler.rst (original)
+++ python/trunk/Doc/library/compiler.rst Sat Jan 3 21:55:06 2009
@@ -559,24 +559,24 @@
>>> import compiler
>>> mod = compiler.parseFile("/tmp/doublelib.py")
>>> mod
- Module('This is an example module.\n\nThis is the docstring.\n',
+ Module('This is an example module.\n\nThis is the docstring.\n',
Stmt([Function(None, 'double', ['x'], [], 0,
- 'Return twice the argument',
+ 'Return twice the argument',
Stmt([Return(Mul((Name('x'), Const(2))))]))]))
>>> from compiler.ast import *
- >>> Module('This is an example module.\n\nThis is the docstring.\n',
+ >>> Module('This is an example module.\n\nThis is the docstring.\n',
... Stmt([Function(None, 'double', ['x'], [], 0,
- ... 'Return twice the argument',
+ ... 'Return twice the argument',
... Stmt([Return(Mul((Name('x'), Const(2))))]))]))
- Module('This is an example module.\n\nThis is the docstring.\n',
+ Module('This is an example module.\n\nThis is the docstring.\n',
Stmt([Function(None, 'double', ['x'], [], 0,
- 'Return twice the argument',
+ 'Return twice the argument',
Stmt([Return(Mul((Name('x'), Const(2))))]))]))
>>> mod.doc
'This is an example module.\n\nThis is the docstring.\n'
>>> for node in mod.node.nodes:
... print node
- ...
+ ...
Function(None, 'double', ['x'], [], 0, 'Return twice the argument',
Stmt([Return(Mul((Name('x'), Const(2))))]))
>>> func = mod.node.nodes[0]
Modified: python/trunk/Doc/library/crypt.rst
==============================================================================
--- python/trunk/Doc/library/crypt.rst (original)
+++ python/trunk/Doc/library/crypt.rst Sat Jan 3 21:55:06 2009
@@ -51,7 +51,7 @@
username = raw_input('Python login:')
cryptedpasswd = pwd.getpwnam(username)[1]
if cryptedpasswd:
- if cryptedpasswd == 'x' or cryptedpasswd == '*':
+ if cryptedpasswd == 'x' or cryptedpasswd == '*':
raise "Sorry, currently no support for shadow passwords"
cleartext = getpass.getpass()
return crypt.crypt(cleartext, cryptedpasswd) == cryptedpasswd
Modified: python/trunk/Doc/library/csv.rst
==============================================================================
--- python/trunk/Doc/library/csv.rst (original)
+++ python/trunk/Doc/library/csv.rst Sat Jan 3 21:55:06 2009
@@ -76,7 +76,7 @@
performed.
A short usage example::
-
+
>>> import csv
>>> spamReader = csv.reader(open('eggs.csv'), delimiter=' ', quotechar='|')
>>> for row in spamReader:
Modified: python/trunk/Doc/library/datetime.rst
==============================================================================
--- python/trunk/Doc/library/datetime.rst (original)
+++ python/trunk/Doc/library/datetime.rst Sat Jan 3 21:55:06 2009
@@ -266,10 +266,10 @@
considered to be true if and only if it isn't equal to ``timedelta(0)``.
Example usage:
-
+
>>> from datetime import timedelta
>>> year = timedelta(days=365)
- >>> another_year = timedelta(weeks=40, days=84, hours=23,
+ >>> another_year = timedelta(weeks=40, days=84, hours=23,
... minutes=50, seconds=600) # adds up to 365 days
>>> year == another_year
True
@@ -517,10 +517,10 @@
True
>>> my_birthday = date(today.year, 6, 24)
>>> if my_birthday < today:
- ... my_birthday = my_birthday.replace(year=today.year + 1)
+ ... my_birthday = my_birthday.replace(year=today.year + 1)
>>> my_birthday
datetime.date(2008, 6, 24)
- >>> time_to_birthday = abs(my_birthday - today)
+ >>> time_to_birthday = abs(my_birthday - today)
>>> time_to_birthday.days
202
@@ -1015,7 +1015,7 @@
>>> tt = dt.timetuple()
>>> for it in tt: # doctest: +SKIP
... print it
- ...
+ ...
2006 # year
11 # month
21 # day
@@ -1044,23 +1044,23 @@
... def __init__(self): # DST starts last Sunday in March
... d = datetime(dt.year, 4, 1) # ends last Sunday in October
... self.dston = d - timedelta(days=d.weekday() + 1)
- ... d = datetime(dt.year, 11, 1)
+ ... d = datetime(dt.year, 11, 1)
... self.dstoff = d - timedelta(days=d.weekday() + 1)
... def utcoffset(self, dt):
... return timedelta(hours=1) + self.dst(dt)
- ... def dst(self, dt):
+ ... def dst(self, dt):
... if self.dston <= dt.replace(tzinfo=None) < self.dstoff:
... return timedelta(hours=1)
... else:
... return timedelta(0)
... def tzname(self,dt):
... return "GMT +1"
- ...
+ ...
>>> class GMT2(tzinfo):
... def __init__(self):
- ... d = datetime(dt.year, 4, 1)
+ ... d = datetime(dt.year, 4, 1)
... self.dston = d - timedelta(days=d.weekday() + 1)
- ... d = datetime(dt.year, 11, 1)
+ ... d = datetime(dt.year, 11, 1)
... self.dstoff = d - timedelta(days=d.weekday() + 1)
... def utcoffset(self, dt):
... return timedelta(hours=1) + self.dst(dt)
@@ -1071,7 +1071,7 @@
... return timedelta(0)
... def tzname(self,dt):
... return "GMT +2"
- ...
+ ...
>>> gmt1 = GMT1()
>>> # Daylight Saving Time
>>> dt1 = datetime(2006, 11, 21, 16, 30, tzinfo=gmt1)
@@ -1092,7 +1092,7 @@
datetime.datetime(2006, 6, 14, 13, 0, tzinfo=<GMT1 object at 0x...>)
>>> dt2.utctimetuple() == dt3.utctimetuple()
True
-
+
.. _datetime-time:
@@ -1240,12 +1240,12 @@
return ``None`` or a string object.
Example:
-
+
>>> from datetime import time, tzinfo
>>> class GMT1(tzinfo):
... def utcoffset(self, dt):
- ... return timedelta(hours=1)
- ... def dst(self, dt):
+ ... return timedelta(hours=1)
+ ... def dst(self, dt):
... return timedelta(0)
... def tzname(self,dt):
... return "Europe/Prague"
@@ -1476,7 +1476,7 @@
:class:`tzinfo` subclasses; there are no ambiguities when using UTC, or any
other fixed-offset :class:`tzinfo` subclass (such as a class representing only
EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)).
-
+
.. _strftime-behavior:
@@ -1521,7 +1521,7 @@
The full set of format codes supported varies across platforms, because Python
calls the platform C library's :func:`strftime` function, and platform
-variations are common.
+variations are common.
The following is a list of all the format codes that the C standard (1989
version) requires, and these work on all platforms with a standard C
Modified: python/trunk/Doc/library/decimal.rst
==============================================================================
--- python/trunk/Doc/library/decimal.rst (original)
+++ python/trunk/Doc/library/decimal.rst Sat Jan 3 21:55:06 2009
@@ -328,7 +328,7 @@
infinity ::= 'Infinity' | 'Inf'
nan ::= 'NaN' [digits] | 'sNaN' [digits]
numeric-value ::= decimal-part [exponent-part] | infinity
- numeric-string ::= [sign] numeric-value | [sign] nan
+ numeric-string ::= [sign] numeric-value | [sign] nan
If *value* is a :class:`tuple`, it should have three components, a sign
(:const:`0` for positive or :const:`1` for negative), a :class:`tuple` of
@@ -970,7 +970,7 @@
* :const:`ROUND_HALF_EVEN` (to nearest with ties going to nearest even integer),
* :const:`ROUND_HALF_UP` (to nearest with ties going away from zero), or
* :const:`ROUND_UP` (away from zero).
- * :const:`ROUND_05UP` (away from zero if last digit after rounding towards zero
+ * :const:`ROUND_05UP` (away from zero if last digit after rounding towards zero
would have been 0 or 5; otherwise towards zero)
The *traps* and *flags* fields list any signals to be set. Generally, new
@@ -1313,7 +1313,7 @@
that would be obtained by computing ``(x**y) % modulo`` with unbounded
precision, but is computed more efficiently. It is always exact.
- .. versionchanged:: 2.6
+ .. versionchanged:: 2.6
``y`` may now be nonintegral in ``x**y``.
Stricter requirements for the three-argument version.
@@ -1455,7 +1455,7 @@
sqrt(-x) and x > 0
0 ** 0
x ** (non-integer)
- x ** Infinity
+ x ** Infinity
.. class:: Overflow
@@ -1558,7 +1558,7 @@
Decimal('9.51111111')
>>> u + (v + w)
Decimal('9.51111111')
- >>>
+ >>>
>>> u, v, w = Decimal(20000), Decimal(-6), Decimal('6.0000003')
>>> (u*v) + (u*w)
Decimal('0.0060000')
@@ -1697,7 +1697,7 @@
"""
q = Decimal(10) ** -places # 2 places --> '0.01'
- sign, digits, exp = value.quantize(q).as_tuple()
+ sign, digits, exp = value.quantize(q).as_tuple()
result = []
digits = map(str, digits)
build, next = result.append, digits.pop
@@ -1754,12 +1754,12 @@
getcontext().prec += 2
i, lasts, s, fact, num = 0, 0, 1, 1, 1
while s != lasts:
- lasts = s
+ lasts = s
i += 1
fact *= i
- num *= x
- s += num / fact
- getcontext().prec -= 2
+ num *= x
+ s += num / fact
+ getcontext().prec -= 2
return +s
def cos(x):
@@ -1776,13 +1776,13 @@
getcontext().prec += 2
i, lasts, s, fact, num, sign = 0, 0, 1, 1, 1, 1
while s != lasts:
- lasts = s
+ lasts = s
i += 2
fact *= i * (i-1)
num *= x * x
sign *= -1
- s += num / fact * sign
- getcontext().prec -= 2
+ s += num / fact * sign
+ getcontext().prec -= 2
return +s
def sin(x):
@@ -1799,13 +1799,13 @@
getcontext().prec += 2
i, lasts, s, fact, num, sign = 1, 0, x, 1, x, 1
while s != lasts:
- lasts = s
+ lasts = s
i += 2
fact *= i * (i-1)
num *= x * x
sign *= -1
- s += num / fact * sign
- getcontext().prec -= 2
+ s += num / fact * sign
+ getcontext().prec -= 2
return +s
@@ -1839,7 +1839,7 @@
>>> Decimal('3.214').quantize(TWOPLACES)
Decimal('3.21')
- >>> # Validate that a number does not exceed two places
+ >>> # Validate that a number does not exceed two places
>>> Decimal('3.21').quantize(TWOPLACES, context=Context(traps=[Inexact]))
Decimal('3.21')
Modified: python/trunk/Doc/library/difflib.rst
==============================================================================
--- python/trunk/Doc/library/difflib.rst (original)
+++ python/trunk/Doc/library/difflib.rst Sat Jan 3 21:55:06 2009
@@ -428,7 +428,7 @@
.. XXX Explain why a dummy is used!
- .. versionchanged:: 2.5
+ .. versionchanged:: 2.5
The guarantee that adjacent triples always describe non-adjacent blocks
was implemented.
Modified: python/trunk/Doc/library/dircache.rst
==============================================================================
--- python/trunk/Doc/library/dircache.rst (original)
+++ python/trunk/Doc/library/dircache.rst Sat Jan 3 21:55:06 2009
@@ -5,11 +5,11 @@
.. module:: dircache
:synopsis: Return directory listing, with cache mechanism.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`dircache` module has been removed in Python 3.0.
-
-
+
+
.. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
Modified: python/trunk/Doc/library/dis.rst
==============================================================================
--- python/trunk/Doc/library/dis.rst (original)
+++ python/trunk/Doc/library/dis.rst Sat Jan 3 21:55:06 2009
@@ -79,8 +79,8 @@
Detect all offsets in the code object *code* which are jump targets, and
return a list of these offsets.
-
-
+
+
.. data:: opname
Sequence of operation names, indexable using the bytecode.
@@ -770,7 +770,7 @@
opcode finds the keyword parameters first. For each keyword argument, the value
is on top of the key. Below the keyword parameters, the positional parameters
are on the stack, with the right-most parameter on top. Below the parameters,
- the function object to call is on the stack. Pops all function arguments, and
+ the function object to call is on the stack. Pops all function arguments, and
the function itself off the stack, and pushes the return value.
Modified: python/trunk/Doc/library/dl.rst
==============================================================================
--- python/trunk/Doc/library/dl.rst (original)
+++ python/trunk/Doc/library/dl.rst Sat Jan 3 21:55:06 2009
@@ -6,11 +6,11 @@
:platform: Unix
:synopsis: Call C functions in shared objects.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`dl` module has been removed in Python 3.0. Use the :mod:`ctypes`
module instead.
-
+
.. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
The :mod:`dl` module defines an interface to the :cfunc:`dlopen` function, which
@@ -91,9 +91,9 @@
Return the pointer for the function named *name*, as a number, if it exists in
the referenced shared object, otherwise ``None``. This is useful in code like::
- >>> if a.sym('time'):
+ >>> if a.sym('time'):
... a.call('time')
- ... else:
+ ... else:
... time.time()
(Note that this function will return a non-zero number, as zero is the *NULL*
Modified: python/trunk/Doc/library/email.mime.rst
==============================================================================
--- python/trunk/Doc/library/email.mime.rst (original)
+++ python/trunk/Doc/library/email.mime.rst Sat Jan 3 21:55:06 2009
@@ -2,7 +2,7 @@
----------------------------------------------------------
.. module:: email.mime
- :synopsis: Build MIME messages.
+ :synopsis: Build MIME messages.
Ordinarily, you get a message object structure by passing a file or some text to
Modified: python/trunk/Doc/library/fileinput.rst
==============================================================================
--- python/trunk/Doc/library/fileinput.rst (original)
+++ python/trunk/Doc/library/fileinput.rst Sat Jan 3 21:55:06 2009
@@ -151,7 +151,7 @@
when standard input is read.
.. warning::
-
+
The current implementation does not work for MS-DOS 8+3 filesystems.
Modified: python/trunk/Doc/library/fl.rst
==============================================================================
--- python/trunk/Doc/library/fl.rst (original)
+++ python/trunk/Doc/library/fl.rst Sat Jan 3 21:55:06 2009
@@ -6,8 +6,8 @@
:platform: IRIX
:synopsis: FORMS library for applications with graphical user interfaces.
:deprecated:
-
-
+
+
.. deprecated:: 2.6
The :mod:`fl` module has been deprecated for removal in Python 3.0.
@@ -484,8 +484,8 @@
:platform: IRIX
:synopsis: Constants used with the fl module.
:deprecated:
-
-
+
+
.. deprecated:: 2.6
The :mod:`FL` module has been deprecated for removal in Python 3.0.
@@ -506,8 +506,8 @@
:platform: IRIX
:synopsis: Functions for loading stored FORMS designs.
:deprecated:
-
-
+
+
.. deprecated:: 2.6
The :mod:`flp` module has been deprecated for removal in Python 3.0.
Modified: python/trunk/Doc/library/fm.rst
==============================================================================
--- python/trunk/Doc/library/fm.rst (original)
+++ python/trunk/Doc/library/fm.rst Sat Jan 3 21:55:06 2009
@@ -6,7 +6,7 @@
:platform: IRIX
:synopsis: Font Manager interface for SGI workstations.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`fm` module has been deprecated for removal in Python 3.0.
Modified: python/trunk/Doc/library/fpformat.rst
==============================================================================
--- python/trunk/Doc/library/fpformat.rst (original)
+++ python/trunk/Doc/library/fpformat.rst Sat Jan 3 21:55:06 2009
@@ -5,10 +5,10 @@
.. module:: fpformat
:synopsis: General floating point formatting functions.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`fpformat` module has been removed in Python 3.0.
-
+
.. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
Modified: python/trunk/Doc/library/functions.rst
==============================================================================
--- python/trunk/Doc/library/functions.rst (original)
+++ python/trunk/Doc/library/functions.rst Sat Jan 3 21:55:06 2009
@@ -888,7 +888,7 @@
.. versionchanged:: 2.5
Use *fget*'s docstring if no *doc* given.
- .. versionchanged:: 2.6
+ .. versionchanged:: 2.6
The ``getter``, ``setter``, and ``deleter`` attributes were added.
@@ -1178,10 +1178,10 @@
single inheritance, "super" can be used to refer to parent classes without
naming them explicitly, thus making the code more maintainable. This use
closely parallels the use of "super" in other programming languages.
-
+
The second use case is to support cooperative multiple inheritence in a
- dynamic execution environment. This use case is unique to Python and is
- not found in statically compiled languages or languages that only support
+ dynamic execution environment. This use case is unique to Python and is
+ not found in statically compiled languages or languages that only support
single inheritance. This makes in possible to implement "diamond diagrams"
where multiple base classes implement the same method. Good design dictates
that this method have the same calling signature in every case (because the
@@ -1242,7 +1242,7 @@
>>> class X(object):
... a = 1
- ...
+ ...
>>> X = type('X', (object,), dict(a=1))
.. versionadded:: 2.2
@@ -1397,7 +1397,7 @@
For example, the statement ``import spam`` results in bytecode resembling the
following code::
-
+
spam = __import__('spam', globals(), locals(), [], -1)
The statement ``import spam.ham`` results in this call::
Modified: python/trunk/Doc/library/gl.rst
==============================================================================
--- python/trunk/Doc/library/gl.rst (original)
+++ python/trunk/Doc/library/gl.rst Sat Jan 3 21:55:06 2009
@@ -6,8 +6,8 @@
:platform: IRIX
:synopsis: Functions from the Silicon Graphics Graphics Library.
:deprecated:
-
-
+
+
.. deprecated:: 2.6
The :mod:`gl` module has been deprecated for removal in Python 3.0.
@@ -166,8 +166,8 @@
:platform: IRIX
:synopsis: Constants used with the gl module.
:deprecated:
-
-
+
+
.. deprecated:: 2.6
The :mod:`DEVICE` module has been deprecated for removal in Python 3.0.
@@ -184,8 +184,8 @@
:platform: IRIX
:synopsis: Constants used with the gl module.
:deprecated:
-
-
+
+
.. deprecated:: 2.6
The :mod:`GL` module has been deprecated for removal in Python 3.0.
Modified: python/trunk/Doc/library/heapq.rst
==============================================================================
--- python/trunk/Doc/library/heapq.rst (original)
+++ python/trunk/Doc/library/heapq.rst Sat Jan 3 21:55:06 2009
@@ -102,7 +102,7 @@
H
N
-
+
The module also offers three general purpose functions based on heaps.
Modified: python/trunk/Doc/library/htmllib.rst
==============================================================================
--- python/trunk/Doc/library/htmllib.rst (original)
+++ python/trunk/Doc/library/htmllib.rst Sat Jan 3 21:55:06 2009
@@ -4,7 +4,7 @@
.. module:: htmllib
:synopsis: A parser for HTML documents.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`htmllib` module has been removed in Python 3.0.
Modified: python/trunk/Doc/library/idle.rst
==============================================================================
--- python/trunk/Doc/library/idle.rst (original)
+++ python/trunk/Doc/library/idle.rst Sat Jan 3 21:55:06 2009
@@ -230,7 +230,7 @@
Keywords
orange
- Strings
+ Strings
green
Comments
Modified: python/trunk/Doc/library/imageop.rst
==============================================================================
--- python/trunk/Doc/library/imageop.rst (original)
+++ python/trunk/Doc/library/imageop.rst Sat Jan 3 21:55:06 2009
@@ -5,7 +5,7 @@
.. module:: imageop
:synopsis: Manipulate raw image data.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`imageop` module has been removed in Python 3.0.
Modified: python/trunk/Doc/library/imgfile.rst
==============================================================================
--- python/trunk/Doc/library/imgfile.rst (original)
+++ python/trunk/Doc/library/imgfile.rst Sat Jan 3 21:55:06 2009
@@ -6,7 +6,7 @@
:platform: IRIX
:synopsis: Support for SGI imglib files.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`imgfile` module has been deprecated for removal in Python 3.0.
Modified: python/trunk/Doc/library/io.rst
==============================================================================
--- python/trunk/Doc/library/io.rst (original)
+++ python/trunk/Doc/library/io.rst Sat Jan 3 21:55:06 2009
@@ -215,7 +215,7 @@
.. method:: close()
Flush and close this stream. This method has no effect if the file is
- already closed. Once the file is closed, any operation on the file
+ already closed. Once the file is closed, any operation on the file
(e.g. reading or writing) will raise an :exc:`IOError`. The internal
file descriptor isn't closed if *closefd* was False.
@@ -629,7 +629,7 @@
.. attribute:: line_buffering
Whether line buffering is enabled.
-
+
.. class:: StringIO([initial_value[, encoding[, errors[, newline]]]])
Modified: python/trunk/Doc/library/itertools.rst
==============================================================================
--- python/trunk/Doc/library/itertools.rst (original)
+++ python/trunk/Doc/library/itertools.rst Sat Jan 3 21:55:06 2009
@@ -76,7 +76,7 @@
.. function:: itertools.chain.from_iterable(iterable)
- Alternate constructor for :func:`chain`. Gets chained inputs from a
+ Alternate constructor for :func:`chain`. Gets chained inputs from a
single iterable argument that is evaluated lazily. Equivalent to::
@classmethod
@@ -93,9 +93,9 @@
Return *r* length subsequences of elements from the input *iterable*.
- Combinations are emitted in lexicographic sort order. So, if the
+ Combinations are emitted in lexicographic sort order. So, if the
input *iterable* is sorted, the combination tuples will be produced
- in sorted order.
+ in sorted order.
Elements are treated as unique based on their position, not on their
value. So if the input elements are unique, there will be no repeat
@@ -314,7 +314,7 @@
for i, element in enumerate(iterable):
if i == nexti:
yield element
- nexti = it.next()
+ nexti = it.next()
If *start* is ``None``, then iteration starts at zero. If *step* is ``None``,
then the step defaults to one.
@@ -380,12 +380,12 @@
Return successive *r* length permutations of elements in the *iterable*.
If *r* is not specified or is ``None``, then *r* defaults to the length
- of the *iterable* and all possible full-length permutations
+ of the *iterable* and all possible full-length permutations
are generated.
- Permutations are emitted in lexicographic sort order. So, if the
+ Permutations are emitted in lexicographic sort order. So, if the
input *iterable* is sorted, the permutation tuples will be produced
- in sorted order.
+ in sorted order.
Elements are treated as unique based on their position, not on their
value. So if the input elements are unique, there will be no repeat
@@ -416,7 +416,7 @@
else:
return
- The code for :func:`permutations` can be also expressed as a subsequence of
+ The code for :func:`permutations` can be also expressed as a subsequence of
:func:`product`, filtered to exclude entries with repeated elements (those
from the same position in the input pool)::
@@ -564,7 +564,7 @@
>>> data = [ 1, 4,5,6, 10, 15,16,17,18, 22, 25,26,27,28]
>>> for k, g in groupby(enumerate(data), lambda (i,x):i-x):
... print map(itemgetter(1), g)
- ...
+ ...
[1]
[4, 5, 6]
[10]
@@ -691,7 +691,7 @@
def unique_everseen(iterable, key=None):
"List unique elements, preserving order. Remember all elements ever seen."
# unique_everseen('AAAABBBCCDAABBB') --> A B C D
- # unique_everseen('ABBCcAD', str.lower) --> A B C D
+ # unique_everseen('ABBCcAD', str.lower) --> A B C D
seen = set()
seen_add = seen.add
if key is None:
Modified: python/trunk/Doc/library/jpeg.rst
==============================================================================
--- python/trunk/Doc/library/jpeg.rst (original)
+++ python/trunk/Doc/library/jpeg.rst Sat Jan 3 21:55:06 2009
@@ -6,7 +6,7 @@
:platform: IRIX
:synopsis: Read and write image files in compressed JPEG format.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`jpeg` module has been deprecated for removal in Python 3.0.
Modified: python/trunk/Doc/library/json.rst
==============================================================================
--- python/trunk/Doc/library/json.rst (original)
+++ python/trunk/Doc/library/json.rst Sat Jan 3 21:55:06 2009
@@ -14,7 +14,7 @@
:mod:`marshal` and :mod:`pickle` modules.
Encoding basic Python object hierarchies::
-
+
>>> import json
>>> json.dumps(['foo', {'bar': ('baz', None, 1.0, 2)}])
'["foo", {"bar": ["baz", null, 1.0, 2]}]'
@@ -43,12 +43,12 @@
>>> import json
>>> print json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=4)
{
- "4": 5,
+ "4": 5,
"6": 7
}
Decoding JSON::
-
+
>>> import json
>>> json.loads('["foo", {"bar":["baz", null, 1.0, 2]}]')
[u'foo', {u'bar': [u'baz', None, 1.0, 2]}]
@@ -66,7 +66,7 @@
... if '__complex__' in dct:
... return complex(dct['real'], dct['imag'])
... return dct
- ...
+ ...
>>> json.loads('{"__complex__": true, "real": 1, "imag": 2}',
... object_hook=as_complex)
(1+2j)
@@ -75,26 +75,26 @@
Decimal('1.1')
Extending :class:`JSONEncoder`::
-
+
>>> import json
>>> class ComplexEncoder(json.JSONEncoder):
... def default(self, obj):
... if isinstance(obj, complex):
... return [obj.real, obj.imag]
... return json.JSONEncoder.default(self, obj)
- ...
+ ...
>>> dumps(2 + 1j, cls=ComplexEncoder)
'[2.0, 1.0]'
>>> ComplexEncoder().encode(2 + 1j)
'[2.0, 1.0]'
>>> list(ComplexEncoder().iterencode(2 + 1j))
['[', '2.0', ', ', '1.0', ']']
-
+
.. highlight:: none
Using json.tool from the shell to validate and pretty-print::
-
+
$ echo '{"json":"obj"}' | python -mjson.tool
{
"json": "obj"
@@ -104,7 +104,7 @@
.. highlight:: python
-.. note::
+.. note::
The JSON produced by this module's default settings is a subset of
YAML, so it may be used as a serializer for that as well.
@@ -368,7 +368,7 @@
For example, to support arbitrary iterators, you could implement default
like this::
-
+
def default(self, o):
try:
iterable = iter(o)
@@ -392,6 +392,6 @@
Encode the given object, *o*, and yield each string representation as
available. For example::
-
+
for chunk in JSONEncoder().iterencode(bigobject):
mysocket.write(chunk)
Modified: python/trunk/Doc/library/locale.rst
==============================================================================
--- python/trunk/Doc/library/locale.rst (original)
+++ python/trunk/Doc/library/locale.rst Sat Jan 3 21:55:06 2009
@@ -494,7 +494,7 @@
>>> import locale
>>> loc = locale.getlocale() # get current locale
>>> locale.setlocale(locale.LC_ALL, 'de_DE') # use German locale; name might vary with platform
- >>> locale.strcoll('f\xe4n', 'foo') # compare a string containing an umlaut
+ >>> locale.strcoll('f\xe4n', 'foo') # compare a string containing an umlaut
>>> locale.setlocale(locale.LC_ALL, '') # use user's preferred locale
>>> locale.setlocale(locale.LC_ALL, 'C') # use default (C) locale
>>> locale.setlocale(locale.LC_ALL, loc) # restore saved locale
Modified: python/trunk/Doc/library/macos.rst
==============================================================================
--- python/trunk/Doc/library/macos.rst (original)
+++ python/trunk/Doc/library/macos.rst Sat Jan 3 21:55:06 2009
@@ -82,7 +82,7 @@
parameter can be a pathname or an ``FSSpec`` or ``FSRef`` object.
.. note::
-
+
It is not possible to use an ``FSSpec`` in 64-bit mode.
@@ -93,7 +93,7 @@
strings.
.. note::
-
+
It is not possible to use an ``FSSpec`` in 64-bit mode.
.. function:: openrf(name [, mode])
Modified: python/trunk/Doc/library/mailbox.rst
==============================================================================
--- python/trunk/Doc/library/mailbox.rst (original)
+++ python/trunk/Doc/library/mailbox.rst Sat Jan 3 21:55:06 2009
@@ -1686,7 +1686,7 @@
# that's better than losing a message completely.
box.lock()
box.add(message)
- box.flush()
+ box.flush()
box.unlock()
# Remove original message
Modified: python/trunk/Doc/library/marshal.rst
==============================================================================
--- python/trunk/Doc/library/marshal.rst (original)
+++ python/trunk/Doc/library/marshal.rst Sat Jan 3 21:55:06 2009
@@ -45,7 +45,7 @@
(they will cause infinite loops).
.. warning::
-
+
On machines where C's ``long int`` type has more than 32 bits (such as the
DEC Alpha), it is possible to create plain Python integers that are longer
than 32 bits. If such an integer is marshaled and read back in on a machine
Modified: python/trunk/Doc/library/math.rst
==============================================================================
--- python/trunk/Doc/library/math.rst (original)
+++ python/trunk/Doc/library/math.rst Sat Jan 3 21:55:06 2009
@@ -109,7 +109,7 @@
.. function:: isnan(x)
Checks if the float *x* is a NaN (not a number). NaNs are part of the
- IEEE 754 standards. Operation like but not limited to ``inf * 0``,
+ IEEE 754 standards. Operation like but not limited to ``inf * 0``,
``inf / inf`` or any operation involving a NaN, e.g. ``nan * 1``, return
a NaN.
Modified: python/trunk/Doc/library/mhlib.rst
==============================================================================
--- python/trunk/Doc/library/mhlib.rst (original)
+++ python/trunk/Doc/library/mhlib.rst Sat Jan 3 21:55:06 2009
@@ -4,7 +4,7 @@
.. module:: mhlib
:synopsis: Manipulate MH mailboxes from Python.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`mhlib` module has been removed in Python 3.0. Use the
:mod:`mailbox` instead.
Modified: python/trunk/Doc/library/mmap.rst
==============================================================================
--- python/trunk/Doc/library/mmap.rst (original)
+++ python/trunk/Doc/library/mmap.rst Sat Jan 3 21:55:06 2009
@@ -93,7 +93,7 @@
will be relative to the offset from the beginning of the file. *offset*
defaults to 0. *offset* must be a multiple of the PAGESIZE or
ALLOCATIONGRANULARITY.
-
+
This example shows a simple way of using :class:`mmap`::
import mmap
Modified: python/trunk/Doc/library/msvcrt.rst
==============================================================================
--- python/trunk/Doc/library/msvcrt.rst (original)
+++ python/trunk/Doc/library/msvcrt.rst Sat Jan 3 21:55:06 2009
@@ -18,7 +18,7 @@
The module implements both the normal and wide char variants of the console I/O
api. The normal API deals only with ASCII characters and is of limited use
-for internationalized applications. The wide char API should be used where
+for internationalized applications. The wide char API should be used where
ever possible
.. _msvcrt-files:
@@ -98,13 +98,13 @@
return the keycode. The :kbd:`Control-C` keypress cannot be read with this
function.
-
+
.. function:: getwch()
Wide char variant of :func:`getch`, returning a Unicode value.
-
+
.. versionadded:: 2.6
-
+
.. function:: getche()
@@ -115,7 +115,7 @@
.. function:: getwche()
Wide char variant of :func:`getche`, returning a Unicode value.
-
+
.. versionadded:: 2.6
@@ -123,24 +123,24 @@
Print the character *char* to the console without buffering.
-
+
.. function:: putwch(unicode_char)
Wide char variant of :func:`putch`, accepting a Unicode value.
-
+
.. versionadded:: 2.6
-
+
.. function:: ungetch(char)
Cause the character *char* to be "pushed back" into the console buffer; it will
be the next character read by :func:`getch` or :func:`getche`.
-
+
.. function:: ungetwch(unicode_char)
Wide char variant of :func:`ungetch`, accepting a Unicode value.
-
+
.. versionadded:: 2.6
Modified: python/trunk/Doc/library/multiprocessing.rst
==============================================================================
--- python/trunk/Doc/library/multiprocessing.rst (original)
+++ python/trunk/Doc/library/multiprocessing.rst Sat Jan 3 21:55:06 2009
@@ -21,9 +21,9 @@
.. warning::
Some of this package's functionality requires a functioning shared semaphore
- implementation on the host operating system. Without one, the
- :mod:`multiprocessing.synchronize` module will be disabled, and attempts to
- import it will result in an :exc:`ImportError`. See
+ implementation on the host operating system. Without one, the
+ :mod:`multiprocessing.synchronize` module will be disabled, and attempts to
+ import it will result in an :exc:`ImportError`. See
:issue:`3770` for additional information.
.. note::
@@ -38,7 +38,7 @@
>>> p = Pool(5)
>>> def f(x):
... return x*x
- ...
+ ...
>>> p.map(f, [1,2,3])
Process PoolWorker-1:
Process PoolWorker-2:
@@ -77,11 +77,11 @@
print 'module name:', __name__
print 'parent process:', os.getppid()
print 'process id:', os.getpid()
-
+
def f(name):
info('function f')
print 'hello', name
-
+
if __name__ == '__main__':
info('main line')
p = Process(target=f, args=('bob',))
@@ -543,7 +543,7 @@
.. method:: put(item[, block[, timeout]])
- Put item into the queue. If the optional argument *block* is ``True``
+ Put item into the queue. If the optional argument *block* is ``True``
(the default) and *timeout* is ``None`` (the default), block if necessary until
a free slot is available. If *timeout* is a positive number, it blocks at
most *timeout* seconds and raises the :exc:`Queue.Full` exception if no
@@ -858,7 +858,7 @@
acceptable. If *block* is ``True`` and *timeout* is not ``None`` then it
specifies a timeout in seconds. If *block* is ``False`` then *timeout* is
ignored.
-
+
Note that on OS/X ``sem_timedwait`` is unsupported, so timeout arguments
for these will be ignored.
@@ -1135,22 +1135,22 @@
server process which is using the given address and authentication key.
.. method:: get_server()
-
+
Returns a :class:`Server` object which represents the actual server under
- the control of the Manager. The :class:`Server` object supports the
+ the control of the Manager. The :class:`Server` object supports the
:meth:`serve_forever` method:
-
+
>>> from multiprocessing.managers import BaseManager
>>> m = BaseManager(address=('', 50000), authkey='abc'))
>>> server = m.get_server()
>>> s.serve_forever()
-
+
:class:`Server` additionally have an :attr:`address` attribute.
.. method:: connect()
-
+
Connect a local manager object to a remote manager process:
-
+
>>> from multiprocessing.managers import BaseManager
>>> m = BaseManager(address='127.0.0.1', authkey='abc))
>>> m.connect()
@@ -1360,7 +1360,7 @@
>>> queue.get()
'hello'
-Local processes can also access that queue, using the code from above on the
+Local processes can also access that queue, using the code from above on the
client to access it remotely::
>>> from multiprocessing import Process, Queue
@@ -1371,12 +1371,12 @@
... super(Worker, self).__init__()
... def run(self):
... self.q.put('local hello')
- ...
+ ...
>>> queue = Queue()
>>> w = Worker(queue)
>>> w.start()
>>> class QueueManager(BaseManager): pass
- ...
+ ...
>>> QueueManager.register('get_queue', callable=lambda: queue)
>>> m = QueueManager(address=('', 50000), authkey='abracadabra')
>>> s = m.get_server()
@@ -2120,7 +2120,7 @@
.. literalinclude:: ../includes/mp_benchmarks.py
An example/demo of how to use the :class:`managers.SyncManager`, :class:`Process`
-and others to build a system which can distribute processes and work via a
+and others to build a system which can distribute processes and work via a
distributed queue to a "cluster" of machines on a network, accessible via SSH.
You will need to have private key authentication for all hosts configured for
this to work.
Modified: python/trunk/Doc/library/mutex.rst
==============================================================================
--- python/trunk/Doc/library/mutex.rst (original)
+++ python/trunk/Doc/library/mutex.rst Sat Jan 3 21:55:06 2009
@@ -5,7 +5,7 @@
.. module:: mutex
:synopsis: Lock and queue for mutual exclusion.
:deprecated:
-
+
.. deprecated::
The :mod:`mutex` module has been removed in Python 3.0.
Modified: python/trunk/Doc/library/nntplib.rst
==============================================================================
--- python/trunk/Doc/library/nntplib.rst (original)
+++ python/trunk/Doc/library/nntplib.rst Sat Jan 3 21:55:06 2009
@@ -24,16 +24,16 @@
Group comp.lang.python has 59 articles, range 3742 to 3803
>>> resp, subs = s.xhdr('subject', first + '-' + last)
>>> for id, sub in subs[-10:]: print id, sub
- ...
+ ...
3792 Re: Removing elements from a list while iterating...
3793 Re: Who likes Info files?
3794 Emacs and doc strings
3795 a few questions about the Mac implementation
3796 Re: executable python scripts
3797 Re: executable python scripts
- 3798 Re: a few questions about the Mac implementation
+ 3798 Re: a few questions about the Mac implementation
3799 Re: PROPOSAL: A Generic Python Object Interface for Python C Modules
- 3802 Re: executable python scripts
+ 3802 Re: executable python scripts
3803 Re: \POSIX{} wait and SIGCHLD
>>> s.quit()
'205 news.cwi.nl closing connection. Goodbye.'
Modified: python/trunk/Doc/library/operator.rst
==============================================================================
--- python/trunk/Doc/library/operator.rst (original)
+++ python/trunk/Doc/library/operator.rst Sat Jan 3 21:55:06 2009
@@ -7,7 +7,7 @@
.. testsetup::
-
+
import operator
from operator import itemgetter
@@ -437,7 +437,7 @@
>>> class C:
... pass
- ...
+ ...
>>> import operator
>>> obj = C()
>>> operator.isMappingType(obj)
@@ -547,9 +547,9 @@
def g(obj):
return tuple(obj[item] for item in items)
return g
-
- The items can be any type accepted by the operand's :meth:`__getitem__`
- method. Dictionaries accept any hashable value. Lists, tuples, and
+
+ The items can be any type accepted by the operand's :meth:`__getitem__`
+ method. Dictionaries accept any hashable value. Lists, tuples, and
strings accept an index or a slice:
>>> itemgetter(1)('ABCDEFG')
Modified: python/trunk/Doc/library/optparse.rst
==============================================================================
--- python/trunk/Doc/library/optparse.rst (original)
+++ python/trunk/Doc/library/optparse.rst Sat Jan 3 21:55:06 2009
@@ -799,7 +799,7 @@
The keyword arguments define attributes of the new Option object. The most
important option attribute is :attr:`action`, and it largely determines which
other attributes are relevant or required. If you pass irrelevant option
-attributes, or fail to pass required ones, :mod:`optparse` raises an
+attributes, or fail to pass required ones, :mod:`optparse` raises an
:exc:`OptionError` exception explaining your mistake.
An option's *action* determines what :mod:`optparse` does when it encounters
Modified: python/trunk/Doc/library/os.rst
==============================================================================
--- python/trunk/Doc/library/os.rst (original)
+++ python/trunk/Doc/library/os.rst Sat Jan 3 21:55:06 2009
@@ -368,7 +368,7 @@
is returned. Availability: Unix, Windows.
.. deprecated:: 2.6
- This function is obsolete. Use the :mod:`subprocess` module. Check
+ This function is obsolete. Use the :mod:`subprocess` module. Check
especially the :ref:`subprocess-replacements` section.
.. versionchanged:: 2.0
@@ -418,7 +418,7 @@
child_stdout)``.
.. deprecated:: 2.6
- This function is obsolete. Use the :mod:`subprocess` module. Check
+ This function is obsolete. Use the :mod:`subprocess` module. Check
especially the :ref:`subprocess-replacements` section.
Availability: Unix, Windows.
@@ -432,7 +432,7 @@
child_stdout, child_stderr)``.
.. deprecated:: 2.6
- This function is obsolete. Use the :mod:`subprocess` module. Check
+ This function is obsolete. Use the :mod:`subprocess` module. Check
especially the :ref:`subprocess-replacements` section.
Availability: Unix, Windows.
@@ -446,7 +446,7 @@
child_stdout_and_stderr)``.
.. deprecated:: 2.6
- This function is obsolete. Use the :mod:`subprocess` module. Check
+ This function is obsolete. Use the :mod:`subprocess` module. Check
especially the :ref:`subprocess-replacements` section.
Availability: Unix, Windows.
@@ -1449,7 +1449,7 @@
These functions all execute a new program, replacing the current process; they
do not return. On Unix, the new executable is loaded into the current process,
and will have the same process id as the caller. Errors will be reported as
- :exc:`OSError` exceptions.
+ :exc:`OSError` exceptions.
The current process is replaced immediately. Open file objects and
descriptors are not flushed, so if there may be data buffered
@@ -1481,7 +1481,7 @@
used to define the environment variables for the new process (these are used
instead of the current process' environment); the functions :func:`execl`,
:func:`execlp`, :func:`execv`, and :func:`execvp` all cause the new process to
- inherit the environment of the current process.
+ inherit the environment of the current process.
Availability: Unix, Windows.
@@ -1718,7 +1718,7 @@
(Note that the :mod:`subprocess` module provides more powerful facilities for
spawning new processes and retrieving their results; using that module is
- preferable to using these functions. Check specially the *Replacing Older
+ preferable to using these functions. Check specially the *Replacing Older
Functions with the subprocess Module* section in that documentation page.)
If *mode* is :const:`P_NOWAIT`, this function returns the process id of the new
Modified: python/trunk/Doc/library/ossaudiodev.rst
==============================================================================
--- python/trunk/Doc/library/ossaudiodev.rst (original)
+++ python/trunk/Doc/library/ossaudiodev.rst Sat Jan 3 21:55:06 2009
@@ -18,26 +18,26 @@
use ALSA, you'll have to make sure its OSS compatibility layer
is active to use ossaudiodev, but you're gonna need it for the vast
majority of Linux audio apps anyways.
-
+
Sounds like things are also complicated for other BSDs. In response
to my python-dev query, Thomas Wouters said:
-
+
> Likewise, googling shows OpenBSD also uses OSS/Free -- the commercial
> OSS installation manual tells you to remove references to OSS/Free from the
> kernel :)
-
+
but Aleksander Piotrowsk actually has an OpenBSD box, and he quotes
from its <soundcard.h>:
> * WARNING! WARNING!
> * This is an OSS (Linux) audio emulator.
> * Use the Native NetBSD API for developing new code, and this
> * only for compiling Linux programs.
-
+
There's also an ossaudio manpage on OpenBSD that explains things
further. Presumably NetBSD and OpenBSD have a different standard
audio interface. That's the great thing about standards, there are so
many to choose from ... ;-)
-
+
This probably all warrants a footnote or two, but I don't understand
things well enough right now to write it! --GPW
Modified: python/trunk/Doc/library/othergui.rst
==============================================================================
--- python/trunk/Doc/library/othergui.rst (original)
+++ python/trunk/Doc/library/othergui.rst Sat Jan 3 21:55:06 2009
@@ -70,7 +70,7 @@
Robin Dunn.
PyGTK, PyQt, and wxPython, all have a modern look and feel and more
-widgets than Tkinter. In addition, there are many other GUI toolkits for
+widgets than Tkinter. In addition, there are many other GUI toolkits for
Python, both cross-platform, and platform-specific. See the `GUI Programming
<http://wiki.python.org/moin/GuiProgramming>`_ page in the Python Wiki for a
much more complete list, and also for links to documents where the
Modified: python/trunk/Doc/library/pdb.rst
==============================================================================
--- python/trunk/Doc/library/pdb.rst (original)
+++ python/trunk/Doc/library/pdb.rst Sat Jan 3 21:55:06 2009
@@ -37,7 +37,7 @@
(Pdb) continue
NameError: 'spam'
> <string>(1)?()
- (Pdb)
+ (Pdb)
:file:`pdb.py` can also be invoked as a script to debug other scripts. For
example::
@@ -68,7 +68,7 @@
>>> pdb.pm()
> ./mymodule.py(3)test2()
-> print spam
- (Pdb)
+ (Pdb)
The module defines the following functions; each enters the debugger in a
slightly different way:
@@ -109,7 +109,7 @@
.. function:: post_mortem([traceback])
- Enter post-mortem debugging of the given *traceback* object. If no
+ Enter post-mortem debugging of the given *traceback* object. If no
*traceback* is given, it uses the one of the exception that is currently
being handled (an exception must be being handled if the default is to be
used).
Modified: python/trunk/Doc/library/pickle.rst
==============================================================================
--- python/trunk/Doc/library/pickle.rst (original)
+++ python/trunk/Doc/library/pickle.rst Sat Jan 3 21:55:06 2009
@@ -413,7 +413,7 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. method:: object.__getinitargs__()
-
+
When a pickled class instance is unpickled, its :meth:`__init__` method is
normally *not* invoked. If it is desirable that the :meth:`__init__` method
be called on unpickling, an old-style class can define a method
@@ -430,31 +430,31 @@
is affected by the values passed to the :meth:`__new__` method for the type
(as it is for tuples and strings). Instances of a :term:`new-style class`
``C`` are created using ::
-
+
obj = C.__new__(C, *args)
-
+
where *args* is the result of calling :meth:`__getnewargs__` on the original
object; if there is no :meth:`__getnewargs__`, an empty tuple is assumed.
.. method:: object.__getstate__()
-
+
Classes can further influence how their instances are pickled; if the class
defines the method :meth:`__getstate__`, it is called and the return state is
pickled as the contents for the instance, instead of the contents of the
instance's dictionary. If there is no :meth:`__getstate__` method, the
instance's :attr:`__dict__` is pickled.
-.. method:: object.__setstate__()
-
+.. method:: object.__setstate__()
+
Upon unpickling, if the class also defines the method :meth:`__setstate__`,
it is called with the unpickled state. [#]_ If there is no
:meth:`__setstate__` method, the pickled state must be a dictionary and its
items are assigned to the new instance's dictionary. If a class defines both
:meth:`__getstate__` and :meth:`__setstate__`, the state object needn't be a
dictionary and these methods can do what they want. [#]_
-
+
.. warning::
-
+
For :term:`new-style class`\es, if :meth:`__getstate__` returns a false
value, the :meth:`__setstate__` method will not be called.
@@ -463,7 +463,7 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. method:: object.__reduce__()
-
+
When the :class:`Pickler` encounters an object of a type it knows nothing
about --- such as an extension type --- it looks in two places for a hint of
how to pickle it. One alternative is for the object to implement a
@@ -518,7 +518,7 @@
is primarily used for dictionary subclasses, but may be used by other
classes as long as they implement :meth:`__setitem__`.
-.. method:: object.__reduce_ex__(protocol)
+.. method:: object.__reduce_ex__(protocol)
It is sometimes useful to know the protocol version when implementing
:meth:`__reduce__`. This can be done by implementing a method named
Modified: python/trunk/Doc/library/popen2.rst
==============================================================================
--- python/trunk/Doc/library/popen2.rst (original)
+++ python/trunk/Doc/library/popen2.rst Sat Jan 3 21:55:06 2009
@@ -9,7 +9,7 @@
.. deprecated:: 2.6
- This module is obsolete. Use the :mod:`subprocess` module. Check
+ This module is obsolete. Use the :mod:`subprocess` module. Check
especially the :ref:`subprocess-replacements` section.
This module allows you to spawn processes and connect to their
Modified: python/trunk/Doc/library/profile.rst
==============================================================================
--- python/trunk/Doc/library/profile.rst (original)
+++ python/trunk/Doc/library/profile.rst Sat Jan 3 21:55:06 2009
@@ -51,17 +51,17 @@
The Python standard library provides three different profilers:
-#. :mod:`cProfile` is recommended for most users; it's a C extension
+#. :mod:`cProfile` is recommended for most users; it's a C extension
with reasonable overhead
- that makes it suitable for profiling long-running programs.
+ that makes it suitable for profiling long-running programs.
Based on :mod:`lsprof`,
- contributed by Brett Rosen and Ted Czotter.
+ contributed by Brett Rosen and Ted Czotter.
.. versionadded:: 2.5
#. :mod:`profile`, a pure Python module whose interface is imitated by
- :mod:`cProfile`. Adds significant overhead to profiled programs.
- If you're trying to extend
+ :mod:`cProfile`. Adds significant overhead to profiled programs.
+ If you're trying to extend
the profiler in some way, the task might be easier with this module.
Copyright © 1994, by InfoSeek Corporation.
@@ -72,7 +72,7 @@
the overhead of profiling, at the expense of longer data
post-processing times. It is no longer maintained and may be
dropped in a future version of Python.
-
+
.. versionchanged:: 2.5
The results should be more meaningful than in the past: the timing core
@@ -276,24 +276,24 @@
that the text string in the far right column was used to sort the output. The
column headings include:
- ncalls
+ ncalls
for the number of calls,
- tottime
+ tottime
for the total time spent in the given function (and excluding time made in calls
to sub-functions),
- percall
+ percall
is the quotient of ``tottime`` divided by ``ncalls``
- cumtime
+ cumtime
is the total time spent in this and all subfunctions (from invocation till
exit). This figure is accurate *even* for recursive functions.
- percall
+ percall
is the quotient of ``cumtime`` divided by primitive calls
- filename:lineno(function)
+ filename:lineno(function)
provides the respective data of each function
When there are two numbers in the first column (for example, ``43/3``), then the
Modified: python/trunk/Doc/library/pyexpat.rst
==============================================================================
--- python/trunk/Doc/library/pyexpat.rst (original)
+++ python/trunk/Doc/library/pyexpat.rst Sat Jan 3 21:55:06 2009
@@ -182,9 +182,9 @@
.. attribute:: xmlparser.buffer_size
- The size of the buffer used when :attr:`buffer_text` is true.
- A new buffer size can be set by assigning a new integer value
- to this attribute.
+ The size of the buffer used when :attr:`buffer_text` is true.
+ A new buffer size can be set by assigning a new integer value
+ to this attribute.
When the size is changed, the buffer will be flushed.
.. versionadded:: 2.3
Modified: python/trunk/Doc/library/re.rst
==============================================================================
--- python/trunk/Doc/library/re.rst (original)
+++ python/trunk/Doc/library/re.rst Sat Jan 3 21:55:06 2009
@@ -994,14 +994,14 @@
>>> pair.match("717ak").group(1)
'7'
-
+
# Error because re.match() returns None, which doesn't have a group() method:
>>> pair.match("718ak").group(1)
Traceback (most recent call last):
File "<pyshell#23>", line 1, in <module>
re.match(r".*(.).*\1", "718ak").group(1)
AttributeError: 'NoneType' object has no attribute 'group'
-
+
>>> pair.match("354aa").group(1)
'a'
@@ -1110,7 +1110,7 @@
Making a Phonebook
^^^^^^^^^^^^^^^^^^
-:func:`split` splits a string into a list delimited by the passed pattern. The
+:func:`split` splits a string into a list delimited by the passed pattern. The
method is invaluable for converting textual data into data structures that can be
easily read and modified by Python as demonstrated in the following example that
creates a phonebook.
@@ -1119,7 +1119,7 @@
triple-quoted string syntax:
>>> input = """Ross McFluff: 834.345.1254 155 Elm Street
- ...
+ ...
... Ronald Heathmore: 892.345.3428 436 Finley Avenue
... Frank Burger: 925.541.7625 662 South Dogwood Way
...
Modified: python/trunk/Doc/library/rexec.rst
==============================================================================
--- python/trunk/Doc/library/rexec.rst (original)
+++ python/trunk/Doc/library/rexec.rst Sat Jan 3 21:55:06 2009
@@ -5,7 +5,7 @@
.. module:: rexec
:synopsis: Basic restricted execution framework.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`rexec` module has been removed in Python 3.0.
@@ -272,7 +272,7 @@
pass
elif mode in ('w', 'wb', 'a', 'ab'):
# check filename : must begin with /tmp/
- if file[:5]!='/tmp/':
+ if file[:5]!='/tmp/':
raise IOError, "can't write outside /tmp"
elif (string.find(file, '/../') >= 0 or
file[:3] == '../' or file[-3:] == '/..'):
Modified: python/trunk/Doc/library/rlcompleter.rst
==============================================================================
--- python/trunk/Doc/library/rlcompleter.rst (original)
+++ python/trunk/Doc/library/rlcompleter.rst Sat Jan 3 21:55:06 2009
@@ -61,6 +61,6 @@
If called for a dotted name, it will try to evaluate anything without obvious
side-effects (functions will not be evaluated, but it can generate calls to
:meth:`__getattr__`) up to the last part, and find matches for the rest via the
- :func:`dir` function. Any exception raised during the evaluation of the
+ :func:`dir` function. Any exception raised during the evaluation of the
expression is caught, silenced and :const:`None` is returned.
Modified: python/trunk/Doc/library/robotparser.rst
==============================================================================
--- python/trunk/Doc/library/robotparser.rst (original)
+++ python/trunk/Doc/library/robotparser.rst Sat Jan 3 21:55:06 2009
@@ -13,7 +13,7 @@
single: World Wide Web
single: URL
single: robots.txt
-
+
.. note::
The :mod:`robotparser` module has been renamed :mod:`urllib.robotparser` in
Python 3.0.
Modified: python/trunk/Doc/library/sched.rst
==============================================================================
--- python/trunk/Doc/library/sched.rst (original)
+++ python/trunk/Doc/library/sched.rst Sat Jan 3 21:55:06 2009
@@ -42,7 +42,7 @@
930343700.276
In multi-threaded environments, the :class:`scheduler` class has limitations
-with respect to thread-safety, inability to insert a new task before
+with respect to thread-safety, inability to insert a new task before
the one currently pending in a running scheduler, and holding up the main
thread until the event queue is empty. Instead, the preferred approach
is to use the :class:`threading.Timer` class instead.
@@ -59,7 +59,7 @@
... Timer(5, print_time, ()).start()
... Timer(10, print_time, ()).start()
... time.sleep(11) # sleep while time-delay events execute
- ... print time.time()
+ ... print time.time()
...
>>> print_some_times()
930343690.257
Modified: python/trunk/Doc/library/sgmllib.rst
==============================================================================
--- python/trunk/Doc/library/sgmllib.rst (original)
+++ python/trunk/Doc/library/sgmllib.rst Sat Jan 3 21:55:06 2009
@@ -4,7 +4,7 @@
.. module:: sgmllib
:synopsis: Only as much of an SGML parser as needed to parse HTML.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`sgmllib` module has been removed in Python 3.0.
Modified: python/trunk/Doc/library/shutil.rst
==============================================================================
--- python/trunk/Doc/library/shutil.rst (original)
+++ python/trunk/Doc/library/shutil.rst Sat Jan 3 21:55:06 2009
@@ -20,7 +20,7 @@
Even the higher-level file copying functions (:func:`copy`, :func:`copy2`)
can't copy all file metadata.
-
+
On POSIX platforms, this means that file owner and group are lost as well
as ACLs. On Mac OS, the resource fork and other metadata are not used.
This means that resources will be lost and file type and creator codes will
@@ -124,7 +124,7 @@
error. Copy permissions and times of directories using :func:`copystat`.
.. versionchanged:: 2.6
- Added the *ignore* argument to be able to influence what is being copied.
+ Added the *ignore* argument to be able to influence what is being copied.
.. function:: rmtree(path[, ignore_errors[, onerror]])
@@ -189,7 +189,7 @@
os.makedirs(dst)
errors = []
for name in names:
- if name in ignored_names:
+ if name in ignored_names:
continue
srcname = os.path.join(src, name)
dstname = os.path.join(dst, name)
@@ -221,7 +221,7 @@
Another example that uses the :func:`ignore_patterns` helper::
from shutil import copytree, ignore_patterns
-
+
copytree(source, destination, ignore=ignore_patterns('*.pyc', 'tmp*'))
This will copy everything except ``.pyc`` files and files or directories whose
@@ -231,7 +231,7 @@
from shutil import copytree
import logging
-
+
def _logpath(path, names):
logging.info('Working in %s' % path)
return [] # nothing will be ignored
Modified: python/trunk/Doc/library/signal.rst
==============================================================================
--- python/trunk/Doc/library/signal.rst (original)
+++ python/trunk/Doc/library/signal.rst Sat Jan 3 21:55:06 2009
@@ -39,12 +39,12 @@
* Some care must be taken if both signals and threads are used in the same
program. The fundamental thing to remember in using signals and threads
simultaneously is: always perform :func:`signal` operations in the main thread
- of execution. Any thread can perform an :func:`alarm`, :func:`getsignal`,
- :func:`pause`, :func:`setitimer` or :func:`getitimer`; only the main thread
- can set a new signal handler, and the main thread will be the only one to
- receive signals (this is enforced by the Python :mod:`signal` module, even
- if the underlying thread implementation supports sending signals to
- individual threads). This means that signals can't be used as a means of
+ of execution. Any thread can perform an :func:`alarm`, :func:`getsignal`,
+ :func:`pause`, :func:`setitimer` or :func:`getitimer`; only the main thread
+ can set a new signal handler, and the main thread will be the only one to
+ receive signals (this is enforced by the Python :mod:`signal` module, even
+ if the underlying thread implementation supports sending signals to
+ individual threads). This means that signals can't be used as a means of
inter-thread communication. Use locks instead.
The variables defined in the :mod:`signal` module are:
@@ -80,22 +80,22 @@
One more than the number of the highest signal number.
-.. data:: ITIMER_REAL
+.. data:: ITIMER_REAL
Decrements interval timer in real time, and delivers :const:`SIGALRM` upon expiration.
-.. data:: ITIMER_VIRTUAL
+.. data:: ITIMER_VIRTUAL
- Decrements interval timer only when the process is executing, and delivers
+ Decrements interval timer only when the process is executing, and delivers
SIGVTALRM upon expiration.
.. data:: ITIMER_PROF
-
- Decrements interval timer both when the process executes and when the
- system is executing on behalf of the process. Coupled with ITIMER_VIRTUAL,
- this timer is usually used to profile the time spent by the application
+
+ Decrements interval timer both when the process executes and when the
+ system is executing on behalf of the process. Coupled with ITIMER_VIRTUAL,
+ this timer is usually used to profile the time spent by the application
in user and kernel space. SIGPROF is delivered upon expiration.
@@ -105,7 +105,7 @@
Raised to signal an error from the underlying :func:`setitimer` or
:func:`getitimer` implementation. Expect this error if an invalid
- interval timer or a negative time is passed to :func:`setitimer`.
+ interval timer or a negative time is passed to :func:`setitimer`.
This error is a subtype of :exc:`IOError`.
@@ -143,21 +143,21 @@
.. function:: setitimer(which, seconds[, interval])
- Sets given interval timer (one of :const:`signal.ITIMER_REAL`,
+ Sets given interval timer (one of :const:`signal.ITIMER_REAL`,
:const:`signal.ITIMER_VIRTUAL` or :const:`signal.ITIMER_PROF`) specified
- by *which* to fire after *seconds* (float is accepted, different from
+ by *which* to fire after *seconds* (float is accepted, different from
:func:`alarm`) and after that every *interval* seconds. The interval
timer specified by *which* can be cleared by setting seconds to zero.
When an interval timer fires, a signal is sent to the process.
- The signal sent is dependent on the timer being used;
- :const:`signal.ITIMER_REAL` will deliver :const:`SIGALRM`,
+ The signal sent is dependent on the timer being used;
+ :const:`signal.ITIMER_REAL` will deliver :const:`SIGALRM`,
:const:`signal.ITIMER_VIRTUAL` sends :const:`SIGVTALRM`,
and :const:`signal.ITIMER_PROF` will deliver :const:`SIGPROF`.
The old values are returned as a tuple: (delay, interval).
- Attempting to pass an invalid interval timer will cause a
+ Attempting to pass an invalid interval timer will cause a
:exc:`ItimerError`.
.. versionadded:: 2.6
@@ -190,7 +190,7 @@
will be restarted when interrupted by signal *signalnum*, otherwise system calls will
be interrupted. Returns nothing. Availability: Unix (see the man page
:manpage:`siginterrupt(3)` for further information).
-
+
Note that installing a signal handler with :func:`signal` will reset the restart
behaviour to interruptible by implicitly calling :cfunc:`siginterrupt` with a true *flag*
value for the given signal.
@@ -239,7 +239,7 @@
signal.alarm(5)
# This open() may hang indefinitely
- fd = os.open('/dev/ttyS0', os.O_RDWR)
+ fd = os.open('/dev/ttyS0', os.O_RDWR)
signal.alarm(0) # Disable the alarm
Modified: python/trunk/Doc/library/simplexmlrpcserver.rst
==============================================================================
--- python/trunk/Doc/library/simplexmlrpcserver.rst (original)
+++ python/trunk/Doc/library/simplexmlrpcserver.rst Sat Jan 3 21:55:06 2009
@@ -151,7 +151,7 @@
requestHandler=RequestHandler)
server.register_introspection_functions()
- # Register pow() function; this will use the value of
+ # Register pow() function; this will use the value of
# pow.__name__ as the name, which is just 'pow'.
server.register_function(pow)
@@ -160,10 +160,10 @@
return x + y
server.register_function(adder_function, 'add')
- # Register an instance; all the methods of the instance are
+ # Register an instance; all the methods of the instance are
# published as XML-RPC methods (in this case, just 'div').
class MyFuncs:
- def div(self, x, y):
+ def div(self, x, y):
return x // y
server.register_instance(MyFuncs())
Modified: python/trunk/Doc/library/smtplib.rst
==============================================================================
--- python/trunk/Doc/library/smtplib.rst (original)
+++ python/trunk/Doc/library/smtplib.rst Sat Jan 3 21:55:06 2009
@@ -189,9 +189,9 @@
Identify yourself to an ESMTP server using ``EHLO``. The hostname argument
defaults to the fully qualified domain name of the local host. Examine the
- response for ESMTP option and store them for use by :meth:`has_extn`.
- Also sets several informational attributes: the message returned by
- the server is stored as the :attr:`ehlo_resp` attribute, :attr:`does_esmtp`
+ response for ESMTP option and store them for use by :meth:`has_extn`.
+ Also sets several informational attributes: the message returned by
+ the server is stored as the :attr:`ehlo_resp` attribute, :attr:`does_esmtp`
is set to true or false depending on whether the server supports ESMTP, and
:attr:`esmtp_features` will be a dictionary containing the names of the
SMTP service extensions this server supports, and their
Modified: python/trunk/Doc/library/socket.rst
==============================================================================
--- python/trunk/Doc/library/socket.rst (original)
+++ python/trunk/Doc/library/socket.rst Sat Jan 3 21:55:06 2009
@@ -184,10 +184,10 @@
.. data:: SIO_*
RCVALL_*
-
+
Constants for Windows' WSAIoctl(). The constants are used as arguments to the
:meth:`ioctl` method of socket objects.
-
+
.. versionadded:: 2.6
.. data:: TIPC_*
@@ -222,7 +222,7 @@
all the necessary arguments for creating the corresponding socket. *host* is a domain
name, a string representation of an IPv4/v6 address or ``None``. *port* is a string
service name such as ``'http'``, a numeric port number or ``None``.
- The rest of the arguments are optional and must be numeric if specified.
+ The rest of the arguments are optional and must be numeric if specified.
By passing ``None`` as the value of *host* and *port*, , you can pass ``NULL`` to the C API.
The :func:`getaddrinfo` function returns a list of 5-tuples with the following
@@ -588,14 +588,14 @@
contents of the buffer (see the optional built-in module :mod:`struct` for a way
to decode C structures encoded as strings).
-
+
.. method:: socket.ioctl(control, option)
- :platform: Windows
-
+ :platform: Windows
+
The :meth:`ioctl` method is a limited interface to the WSAIoctl system
interface. Please refer to the MSDN documentation for more information.
-
+
.. versionadded:: 2.6
@@ -909,7 +909,7 @@
s.close()
print 'Received', repr(data)
-
+
The last example shows how to write a very simple network sniffer with raw
sockets on Windows. The example requires administrator privileges to modify
the interface::
@@ -918,19 +918,19 @@
# the public network interface
HOST = socket.gethostbyname(socket.gethostname())
-
+
# create a raw socket and bind it to the public interface
s = socket.socket(socket.AF_INET, socket.SOCK_RAW, socket.IPPROTO_IP)
s.bind((HOST, 0))
-
+
# Include IP headers
s.setsockopt(socket.IPPROTO_IP, socket.IP_HDRINCL, 1)
-
+
# receive all packages
s.ioctl(socket.SIO_RCVALL, socket.RCVALL_ON)
-
+
# receive a package
print s.recvfrom(65565)
-
+
# disabled promiscuous mode
s.ioctl(socket.SIO_RCVALL, socket.RCVALL_OFF)
Modified: python/trunk/Doc/library/sqlite3.rst
==============================================================================
--- python/trunk/Doc/library/sqlite3.rst (original)
+++ python/trunk/Doc/library/sqlite3.rst Sat Jan 3 21:55:06 2009
@@ -244,7 +244,7 @@
.. method:: Connection.rollback()
- This method rolls back any changes to the database since the last call to
+ This method rolls back any changes to the database since the last call to
:meth:`commit`.
.. method:: Connection.close()
@@ -487,29 +487,29 @@
.. literalinclude:: ../includes/sqlite3/executescript.py
-.. method:: Cursor.fetchone()
-
+.. method:: Cursor.fetchone()
+
Fetches the next row of a query result set, returning a single sequence,
or :const:`None` when no more data is available.
.. method:: Cursor.fetchmany([size=cursor.arraysize])
-
+
Fetches the next set of rows of a query result, returning a list. An empty
list is returned when no more rows are available.
-
+
The number of rows to fetch per call is specified by the *size* parameter.
If it is not given, the cursor's arraysize determines the number of rows
to be fetched. The method should try to fetch as many rows as indicated by
the size parameter. If this is not possible due to the specified number of
rows not being available, fewer rows may be returned.
-
+
Note there are performance considerations involved with the *size* parameter.
For optimal performance, it is usually best to use the arraysize attribute.
If the *size* parameter is used, then it is best for it to retain the same
value from one :meth:`fetchmany` call to the next.
-
-.. method:: Cursor.fetchall()
+
+.. method:: Cursor.fetchall()
Fetches all (remaining) rows of a query result, returning a list. Note that
the cursor's arraysize attribute can affect the performance of this operation.
@@ -546,8 +546,8 @@
This read-only attribute provides the column names of the last query. To
remain compatible with the Python DB API, it returns a 7-tuple for each
- column where the last six items of each tuple are :const:`None`.
-
+ column where the last six items of each tuple are :const:`None`.
+
It is set for ``SELECT`` statements without any matching rows as well.
.. _sqlite3-row-objects:
@@ -558,7 +558,7 @@
.. class:: Row
A :class:`Row` instance serves as a highly optimized
- :attr:`~Connection.row_factory` for :class:`Connection` objects.
+ :attr:`~Connection.row_factory` for :class:`Connection` objects.
It tries to mimic a tuple in most of its features.
It supports mapping access by column name and index, iteration,
@@ -566,7 +566,7 @@
If two :class:`Row` objects have exactly the same columns and their
members are equal, they compare equal.
-
+
.. versionchanged:: 2.6
Added iteration and equality (hashability).
@@ -793,7 +793,7 @@
------------------------
By default, the :mod:`sqlite3` module opens transactions implicitly before a
-Data Modification Language (DML) statement (i.e.
+Data Modification Language (DML) statement (i.e.
``INSERT``/``UPDATE``/``DELETE``/``REPLACE``), and commits transactions
implicitly before a non-DML, non-query statement (i. e.
anything other than ``SELECT`` or the aforementioned).
Modified: python/trunk/Doc/library/ssl.rst
==============================================================================
--- python/trunk/Doc/library/ssl.rst (original)
+++ python/trunk/Doc/library/ssl.rst Sat Jan 3 21:55:06 2009
@@ -48,7 +48,7 @@
.. exception:: SSLError
- Raised to signal an error from the underlying SSL implementation. This
+ Raised to signal an error from the underlying SSL implementation. This
signifies some problem in the higher-level
encryption and authentication layer that's superimposed on the underlying
network connection. This error is a subtype of :exc:`socket.error`, which
@@ -173,7 +173,7 @@
>>> import time
>>> time.ctime(ssl.cert_time_to_seconds("May 9 00:00:00 2007 GMT"))
'Wed May 9 00:00:00 2007'
- >>>
+ >>>
.. function:: get_server_certificate (addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None)
@@ -385,7 +385,7 @@
the client or server, and then the certificate for the issuer of that
certificate, and then the certificate for the issuer of *that* certificate,
and so on up the chain till you get to a certificate which is *self-signed*,
-that is, a certificate which has the same subject and issuer,
+that is, a certificate which has the same subject and issuer,
sometimes called a *root certificate*. The certificates should just
be concatenated together in the certificate file. For example, suppose
we had a three certificate chain, from our server certificate to the
@@ -422,13 +422,13 @@
you only need the root certificates, and the remote peer is supposed to
furnish the other certificates necessary to chain from its certificate to
a root certificate.
-See :rfc:`4158` for more discussion of the way in which
+See :rfc:`4158` for more discussion of the way in which
certification chains can be built.
If you are going to create a server that provides SSL-encrypted
connection services, you will need to acquire a certificate for that
service. There are many ways of acquiring appropriate certificates,
-such as buying one from a certification authority. Another common
+such as buying one from a certification authority. Another common
practice is to generate a self-signed certificate. The simplest
way to do this is with the OpenSSL package, using something like
the following::
@@ -570,7 +570,7 @@
And go back to listening for new client connections.
-
+
.. seealso::
Class :class:`socket.socket`
Modified: python/trunk/Doc/library/statvfs.rst
==============================================================================
--- python/trunk/Doc/library/statvfs.rst (original)
+++ python/trunk/Doc/library/statvfs.rst Sat Jan 3 21:55:06 2009
@@ -4,7 +4,7 @@
.. module:: statvfs
:synopsis: Constants for interpreting the result of os.statvfs().
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`statvfs` module has been deprecated for removal in Python 3.0.
Modified: python/trunk/Doc/library/stdtypes.rst
==============================================================================
--- python/trunk/Doc/library/stdtypes.rst (original)
+++ python/trunk/Doc/library/stdtypes.rst Sat Jan 3 21:55:06 2009
@@ -362,9 +362,9 @@
though the result's type is not necessarily int.
(6)
- float also accepts the strings "nan" and "inf" with an optional prefix "+"
+ float also accepts the strings "nan" and "inf" with an optional prefix "+"
or "-" for Not a Number (NaN) and positive or negative infinity.
-
+
.. versionadded:: 2.6
(7)
@@ -489,7 +489,7 @@
original float and with a positive denominator. Raises
:exc:`OverflowError` on infinities and a :exc:`ValueError` on
NaNs.
-
+
.. versionadded:: 2.6
Two methods support conversion to
@@ -1209,7 +1209,7 @@
Return the numeric string left filled with zeros in a string of length
*width*. A sign prefix is handled correctly. The original string is
returned if *width* is less than ``len(s)``.
-
+
.. versionadded:: 2.2.2
@@ -1221,7 +1221,7 @@
otherwise. Numeric characters include digit characters, and all characters
that have the Unicode numeric value property, e.g. U+2155,
VULGAR FRACTION ONE FIFTH.
-
+
.. method:: unicode.isdecimal()
Return ``True`` if there are only decimal characters in S, ``False``
@@ -1898,7 +1898,7 @@
Return the item of *d* with key *key*. Raises a :exc:`KeyError` if *key*
is not in the map.
- .. versionadded:: 2.5
+ .. versionadded:: 2.5
If a subclass of dict defines a method :meth:`__missing__`, if the key
*key* is not present, the ``d[key]`` operation calls that method with
the key *key* as argument. The ``d[key]`` operation then returns or
@@ -2217,7 +2217,7 @@
positioning); other values are ``os.SEEK_CUR`` or ``1`` (seek relative to the
current position) and ``os.SEEK_END`` or ``2`` (seek relative to the file's
end). There is no return value.
-
+
For example, ``f.seek(2, os.SEEK_CUR)`` advances the position by two and
``f.seek(-3, os.SEEK_END)`` sets the position to the third to last.
Modified: python/trunk/Doc/library/string.rst
==============================================================================
--- python/trunk/Doc/library/string.rst (original)
+++ python/trunk/Doc/library/string.rst Sat Jan 3 21:55:06 2009
@@ -126,7 +126,7 @@
:meth:`format` is just a wrapper that calls :meth:`vformat`.
.. method:: vformat(format_string, args, kwargs)
-
+
This function does the actual work of formatting. It is exposed as a
separate function for cases where you want to pass in a predefined
dictionary of arguments, rather than unpacking and repacking the
@@ -139,12 +139,12 @@
intended to be replaced by subclasses:
.. method:: parse(format_string)
-
+
Loop over the format_string and return an iterable of tuples
(*literal_text*, *field_name*, *format_spec*, *conversion*). This is used
by :meth:`vformat` to break the string in to either literal text, or
replacement fields.
-
+
The values in the tuple conceptually represent a span of literal text
followed by a single replacement field. If there is no literal text
(which can happen if two replacement fields occur consecutively), then
@@ -162,7 +162,7 @@
*key* parameter to :meth:`get_value`.
.. method:: get_value(key, args, kwargs)
-
+
Retrieve a given field value. The *key* argument will be either an
integer or a string. If it is an integer, it represents the index of the
positional argument in *args*; if it is a string, then it represents a
@@ -200,7 +200,7 @@
method is provided so that subclasses can override it.
.. method:: convert_field(value, conversion)
-
+
Converts the value (returned by :meth:`get_field`) given a conversion type
(as in the tuple returned by the :meth:`parse` method.) The default
version understands 'r' (repr) and 's' (str) conversion types.
@@ -229,7 +229,7 @@
element_index: `integer`
conversion: "r" | "s"
format_spec: <described in the next section>
-
+
In less formal terms, the replacement field starts with a *field_name*, which
can either be a number (for a positional argument), or an identifier (for
keyword arguments). Following this is an optional *conversion* field, which is
@@ -249,7 +249,7 @@
"My quest is {name}" # References keyword argument 'name'
"Weight in tons {0.weight}" # 'weight' attribute of first positional arg
"Units destroyed: {players[0]}" # First element of keyword argument 'players'.
-
+
The *conversion* field causes a type coercion before formatting. Normally, the
job of formatting a value is done by the :meth:`__format__` method of the value
itself. However, in some cases it is desirable to force a type to be formatted
@@ -292,11 +292,11 @@
Then the outer replacement field would be evaluated, producing::
"noses "
-
+
Which is substituted into the string, yielding::
-
+
"A man with two noses "
-
+
(The extra space is because we specified a field width of 10, and because left
alignment is the default for strings.)
@@ -328,7 +328,7 @@
width: `integer`
precision: `integer`
type: "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "x" | "X" | "%"
-
+
The *fill* character can be any character other than '}' (which signifies the
end of the field). The presence of a fill character is signaled by the *next*
character, which must be one of the alignment options. If the second character
@@ -421,9 +421,9 @@
+---------+----------------------------------------------------------+
| None | The same as ``'d'``. |
+---------+----------------------------------------------------------+
-
+
The available presentation types for floating point and decimal values are:
-
+
+---------+----------------------------------------------------------+
| Type | Meaning |
+=========+==========================================================+
Modified: python/trunk/Doc/library/stringio.rst
==============================================================================
--- python/trunk/Doc/library/stringio.rst (original)
+++ python/trunk/Doc/library/stringio.rst Sat Jan 3 21:55:06 2009
@@ -52,7 +52,7 @@
# 'First line.\nSecond line.\n'
contents = output.getvalue()
- # Close object and discard memory buffer --
+ # Close object and discard memory buffer --
# .getvalue() will now raise an exception.
output.close()
@@ -81,7 +81,7 @@
Calling :func:`StringIO` with a Unicode string parameter populates
the object with the buffer representation of the Unicode string, instead of
-encoding the string.
+encoding the string.
Another difference from the :mod:`StringIO` module is that calling
:func:`StringIO` with a string parameter creates a read-only object. Unlike an
@@ -118,7 +118,7 @@
# 'First line.\nSecond line.\n'
contents = output.getvalue()
- # Close object and discard memory buffer --
+ # Close object and discard memory buffer --
# .getvalue() will now raise an exception.
output.close()
Modified: python/trunk/Doc/library/subprocess.rst
==============================================================================
--- python/trunk/Doc/library/subprocess.rst (original)
+++ python/trunk/Doc/library/subprocess.rst Sat Jan 3 21:55:06 2009
@@ -131,7 +131,7 @@
Special value that can be used as the *stderr* argument to :class:`Popen` and
indicates that standard error should go into the same handle as standard
output.
-
+
Convenience Functions
^^^^^^^^^^^^^^^^^^^^^
@@ -326,7 +326,7 @@
The child return code, set by :meth:`poll` and :meth:`wait` (and indirectly
by :meth:`communicate`). A ``None`` value indicates that the process
hasn't terminated yet.
-
+
A negative value ``-N`` indicates that the child was terminated by signal
``N`` (Unix only).
Modified: python/trunk/Doc/library/sunaudio.rst
==============================================================================
--- python/trunk/Doc/library/sunaudio.rst (original)
+++ python/trunk/Doc/library/sunaudio.rst Sat Jan 3 21:55:06 2009
@@ -6,7 +6,7 @@
:platform: SunOS
:synopsis: Access to Sun audio hardware.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`sunaudiodev` module has been deprecated for removal in Python 3.0.
@@ -151,7 +151,7 @@
:platform: SunOS
:synopsis: Constants for use with sunaudiodev.
:deprecated:
-
+
.. deprecated:: 2.6
The :mod:`SUNAUDIODEV` module has been deprecated for removal in Python 3.0.
Modified: python/trunk/Doc/library/sys.rst
==============================================================================
--- python/trunk/Doc/library/sys.rst (original)
+++ python/trunk/Doc/library/sys.rst Sat Jan 3 21:55:06 2009
@@ -402,7 +402,7 @@
The *default* argument allows to define a value which will be returned
if the object type does not provide means to retrieve the size and would
- cause a `TypeError`.
+ cause a `TypeError`.
func:`getsizeof` calls the object's __sizeof__ method and adds an additional
garbage collector overhead if the object is managed by the garbage collector.
@@ -731,7 +731,7 @@
The events have the following meaning:
- ``'call'``
+ ``'call'``
A function is called (or some other code block entered). The
global trace function is called; *arg* is ``None``; the return value
specifies the local trace function.
@@ -799,7 +799,7 @@
prompts of :func:`input` and :func:`raw_input`. The interpreter's own prompts
and (almost all of) its error messages go to ``stderr``. ``stdout`` and
``stderr`` needn't be built-in file objects: any object is acceptable as long
- as it has a :meth:`write` method that takes a string argument. (Changing these
+ as it has a :meth:`write` method that takes a string argument. (Changing these
objects doesn't affect the standard I/O streams of processes executed by
:func:`os.popen`, :func:`os.system` or the :func:`exec\*` family of functions in
the :mod:`os` module.)
Modified: python/trunk/Doc/library/tk.rst
==============================================================================
--- python/trunk/Doc/library/tk.rst (original)
+++ python/trunk/Doc/library/tk.rst Sat Jan 3 21:55:06 2009
@@ -22,15 +22,15 @@
mechanism which allows Python and Tcl to interact.
:mod:`Tkinter`'s chief virtues are that it is fast, and that it usually comes
-bundled with Python. Although its standard documentation is weak, good
-material is available, which includes: references, tutorials, a book and
-others. :mod:`Tkinter` is also famous for having an outdated look and feel,
-which has been vastly improved in Tk 8.5. Nevertheless, there are many other
-GUI libraries that you could be interested in. For more information about
+bundled with Python. Although its standard documentation is weak, good
+material is available, which includes: references, tutorials, a book and
+others. :mod:`Tkinter` is also famous for having an outdated look and feel,
+which has been vastly improved in Tk 8.5. Nevertheless, there are many other
+GUI libraries that you could be interested in. For more information about
alternatives, see the :ref:`other-gui-packages` section.
.. toctree::
-
+
tkinter.rst
tix.rst
scrolledtext.rst
Modified: python/trunk/Doc/library/tkinter.rst
==============================================================================
--- python/trunk/Doc/library/tkinter.rst (original)
+++ python/trunk/Doc/library/tkinter.rst Sat Jan 3 21:55:06 2009
@@ -284,7 +284,7 @@
someOptions), in C++, you would express this as fred.someAction(someOptions),
and in Tk, you say::
- .fred someAction someOptions
+ .fred someAction someOptions
Note that the object name, ``.fred``, starts with a dot.
@@ -490,7 +490,7 @@
For more extensive information on the packer and the options that it can take,
see the man pages and page 183 of John Ousterhout's book.
-anchor
+anchor
Anchor type. Denotes where the packer is to place each slave in its parcel.
expand
@@ -720,7 +720,7 @@
they are denoted in Tk, which can be useful when referring to the Tk man pages.
::
- Tk Tkinter Event Field Tk Tkinter Event Field
+ Tk Tkinter Event Field Tk Tkinter Event Field
-- ------------------- -- -------------------
%f focus %A char
%h height %E send_event
Modified: python/trunk/Doc/library/trace.rst
==============================================================================
--- python/trunk/Doc/library/trace.rst (original)
+++ python/trunk/Doc/library/trace.rst Sat Jan 3 21:55:06 2009
@@ -65,13 +65,13 @@
:option:`--ignore-module`
Accepts comma separated list of module names. Ignore each of the named
- module and its submodules (if it is a package). May be given
+ module and its submodules (if it is a package). May be given
multiple times.
:option:`--ignore-dir`
Ignore all modules and packages in the named directory and subdirectories
(multiple directories can be joined by os.pathsep). May be given multiple
- times.
+ times.
.. _trace-api:
Modified: python/trunk/Doc/library/traceback.rst
==============================================================================
--- python/trunk/Doc/library/traceback.rst (original)
+++ python/trunk/Doc/library/traceback.rst Sat Jan 3 21:55:06 2009
@@ -169,10 +169,10 @@
def lumberjack():
bright_side_of_death()
-
+
def bright_side_of_death():
return tuple()[0]
-
+
try:
lumberjack()
except:
@@ -251,12 +251,12 @@
>>> import traceback
>>> def another_function():
... lumberstack()
- ...
+ ...
>>> def lumberstack():
... traceback.print_stack()
... print repr(traceback.extract_stack())
... print repr(traceback.format_stack())
- ...
+ ...
>>> another_function()
File "<doctest>", line 10, in <module>
another_function()
Modified: python/trunk/Doc/library/turtle.rst
==============================================================================
--- python/trunk/Doc/library/turtle.rst (original)
+++ python/trunk/Doc/library/turtle.rst Sat Jan 3 21:55:06 2009
@@ -1587,7 +1587,7 @@
Subclass of TurtleScreen, with :ref:`four methods added <screenspecific>`.
-
+
.. class:: ScrolledCavas(master)
:param master: some Tkinter widget to contain the ScrolledCanvas, i.e.
@@ -1612,13 +1612,13 @@
"compound" ``None`` (a compund shape has to be constructed using the
:meth:`addcomponent` method)
=========== ===========
-
+
.. method:: addcomponent(poly, fill, outline=None)
:param poly: a polygon, i.e. a tuple of pairs of numbers
:param fill: a color the *poly* will be filled with
:param outline: a color for the poly's outline (if given)
-
+
Example:
>>> poly = ((0,0),(10,-5),(0,10),(-10,-5))
@@ -1662,31 +1662,31 @@
>>> help(Screen.bgcolor)
Help on method bgcolor in module turtle:
-
+
bgcolor(self, *args) unbound turtle.Screen method
Set or return backgroundcolor of the TurtleScreen.
-
+
Arguments (if given): a color string or three numbers
in the range 0..colormode or a 3-tuple of such numbers.
-
-
+
+
>>> screen.bgcolor("orange")
>>> screen.bgcolor()
"orange"
>>> screen.bgcolor(0.5,0,0.5)
>>> screen.bgcolor()
"#800080"
-
+
>>> help(Turtle.penup)
Help on method penup in module turtle:
-
+
penup(self) unbound turtle.Turtle method
Pull the pen up -- no drawing when moving.
-
+
Aliases: penup | pu | up
-
+
No argument
-
+
>>> turtle.penup()
- The docstrings of the functions which are derived from methods have a modified
@@ -1694,32 +1694,32 @@
>>> help(bgcolor)
Help on function bgcolor in module turtle:
-
+
bgcolor(*args)
Set or return backgroundcolor of the TurtleScreen.
-
+
Arguments (if given): a color string or three numbers
in the range 0..colormode or a 3-tuple of such numbers.
-
+
Example::
-
+
>>> bgcolor("orange")
>>> bgcolor()
"orange"
>>> bgcolor(0.5,0,0.5)
>>> bgcolor()
"#800080"
-
+
>>> help(penup)
Help on function penup in module turtle:
-
+
penup()
Pull the pen up -- no drawing when moving.
-
+
Aliases: penup | pu | up
-
+
No argument
-
+
Example:
>>> penup()
Modified: python/trunk/Doc/library/undoc.rst
==============================================================================
--- python/trunk/Doc/library/undoc.rst (original)
+++ python/trunk/Doc/library/undoc.rst Sat Jan 3 21:55:06 2009
@@ -21,7 +21,7 @@
:mod:`ihooks`
--- Import hook support (for :mod:`rexec`; may become obsolete).
-
+
.. warning:: The :mod:`ihooks` module has been removed in Python 3.0.
@@ -54,7 +54,7 @@
:mod:`linuxaudiodev`
--- Play audio data on the Linux audio device. Replaced in Python 2.3 by the
:mod:`ossaudiodev` module.
-
+
.. warning:: The :mod:`linuxaudiodev` module has been removed in Python 3.0.
:mod:`sunaudio`
@@ -240,7 +240,7 @@
:mod:`timing`
--- Measure time intervals to high resolution (use :func:`time.clock` instead).
-
+
.. warning:: The :mod:`timing` module has been removed in Python 3.0.
@@ -255,6 +255,6 @@
:mod:`sv`
--- Interface to the "simple video" board on SGI Indigo (obsolete hardware).
-
+
.. warning:: The :mod:`sv` module has been removed in Python 3.0.
Modified: python/trunk/Doc/library/unicodedata.rst
==============================================================================
--- python/trunk/Doc/library/unicodedata.rst (original)
+++ python/trunk/Doc/library/unicodedata.rst Sat Jan 3 21:55:06 2009
@@ -164,7 +164,7 @@
File "<stdin>", line 1, in ?
ValueError: not a decimal
>>> unicodedata.category(u'A') # 'L'etter, 'u'ppercase
- 'Lu'
+ 'Lu'
>>> unicodedata.bidirectional(u'\u0660') # 'A'rabic, 'N'umber
'AN'
Modified: python/trunk/Doc/library/unittest.rst
==============================================================================
--- python/trunk/Doc/library/unittest.rst (original)
+++ python/trunk/Doc/library/unittest.rst Sat Jan 3 21:55:06 2009
@@ -595,7 +595,7 @@
TestCase.failUnlessAlmostEqual(first, second[, places[, msg]])
Test that *first* and *second* are approximately equal by computing the
- difference, rounding to the given number of decimal *places* (default 7),
+ difference, rounding to the given number of decimal *places* (default 7),
and comparing to zero.
Note that comparing a given number of decimal places is not the same as
comparing a given number of significant digits. If the values do not compare
@@ -606,7 +606,7 @@
TestCase.failIfAlmostEqual(first, second[, places[, msg]])
Test that *first* and *second* are not approximately equal by computing the
- difference, rounding to the given number of decimal *places* (default 7),
+ difference, rounding to the given number of decimal *places* (default 7),
and comparing to zero.
Note that comparing a given number of decimal places is not the same as
comparing a given number of significant digits. If the values do not compare
Modified: python/trunk/Doc/library/urllib.rst
==============================================================================
--- python/trunk/Doc/library/urllib.rst (original)
+++ python/trunk/Doc/library/urllib.rst Sat Jan 3 21:55:06 2009
@@ -123,7 +123,7 @@
.. versionchanged:: 2.6
Added :meth:`getcode` to returned object and support for the
:envvar:`no_proxy` environment variable.
-
+
.. deprecated:: 2.6
The :func:`urlopen` function has been removed in Python 3.0 in favor
of :func:`urllib2.urlopen`.
Modified: python/trunk/Doc/library/urllib2.rst
==============================================================================
--- python/trunk/Doc/library/urllib2.rst (original)
+++ python/trunk/Doc/library/urllib2.rst Sat Jan 3 21:55:06 2009
@@ -109,7 +109,7 @@
.. attribute:: code
- An HTTP status code as defined in `RFC 2616 <http://www.faqs.org/rfcs/rfc2616.html>`_.
+ An HTTP status code as defined in `RFC 2616 <http://www.faqs.org/rfcs/rfc2616.html>`_.
This numeric value corresponds to a value found in the dictionary of
codes as found in :attr:`BaseHTTPServer.BaseHTTPRequestHandler.responses`.
Modified: python/trunk/Doc/library/warnings.rst
==============================================================================
--- python/trunk/Doc/library/warnings.rst (original)
+++ python/trunk/Doc/library/warnings.rst Sat Jan 3 21:55:06 2009
@@ -274,7 +274,7 @@
.. function:: warnpy3k(message[, category[, stacklevel]])
- Issue a warning related to Python 3.x deprecation. Warnings are only shown
+ Issue a warning related to Python 3.x deprecation. Warnings are only shown
when Python is started with the -3 option. Like :func:`warn` *message* must
be a string and *category* a subclass of :exc:`Warning`. :func:`warnpy3k`
is using :exc:`DeprecationWarning` as default warning class.
@@ -288,7 +288,7 @@
this function with an alternative implementation by assigning to
``warnings.showwarning``.
*line* is a line of source code to be included in the warning
- message; if *line* is not supplied, :func:`showwarning` will
+ message; if *line* is not supplied, :func:`showwarning` will
try to read the line specified by *filename* and *lineno*.
.. versionchanged:: 2.6
@@ -299,8 +299,8 @@
.. function:: formatwarning(message, category, filename, lineno[, line])
Format a warning the standard way. This returns a string which may contain
- embedded newlines and ends in a newline. *line* is
- a line of source code to be included in the warning message; if *line* is not supplied,
+ embedded newlines and ends in a newline. *line* is
+ a line of source code to be included in the warning message; if *line* is not supplied,
:func:`formatwarning` will try to read the line specified by *filename* and *lineno*.
.. versionchanged:: 2.6
Modified: python/trunk/Doc/library/webbrowser.rst
==============================================================================
--- python/trunk/Doc/library/webbrowser.rst (original)
+++ python/trunk/Doc/library/webbrowser.rst Sat Jan 3 21:55:06 2009
@@ -160,7 +160,7 @@
url = 'http://www.python.org'
- # Open URL in a new tab, if a browser window is already open.
+ # Open URL in a new tab, if a browser window is already open.
webbrowser.open_new_tab(url + '/doc')
# Open URL in new window, raising the window if possible.
Modified: python/trunk/Doc/library/wsgiref.rst
==============================================================================
--- python/trunk/Doc/library/wsgiref.rst (original)
+++ python/trunk/Doc/library/wsgiref.rst Sat Jan 3 21:55:06 2009
@@ -170,7 +170,7 @@
filelike = StringIO("This is an example file-like object"*10)
wrapper = FileWrapper(filelike, blksize=5)
- for chunk in wrapper:
+ for chunk in wrapper:
print chunk
@@ -415,7 +415,7 @@
from wsgiref.validate import validator
from wsgiref.simple_server import make_server
- # Our callable object which is intentionally not compliant to the
+ # Our callable object which is intentionally not compliant to the
# standard, so the validator is going to break
def simple_app(environ, start_response):
status = '200 OK' # HTTP Status
Modified: python/trunk/Doc/library/xml.etree.elementtree.rst
==============================================================================
--- python/trunk/Doc/library/xml.etree.elementtree.rst (original)
+++ python/trunk/Doc/library/xml.etree.elementtree.rst Sat Jan 3 21:55:06 2009
@@ -34,7 +34,7 @@
A C implementation of this API is available as :mod:`xml.etree.cElementTree`.
See http://effbot.org/zone/element-index.htm for tutorials and links to other
-docs. Fredrik Lundh's page is also the location of the development version of the
+docs. Fredrik Lundh's page is also the location of the development version of the
xml.etree.ElementTree.
.. _elementtree-functions:
@@ -379,7 +379,7 @@
<title>Example page</title>
</head>
<body>
- <p>Moved to <a href="http://example.org/">example.org</a>
+ <p>Moved to <a href="http://example.org/">example.org</a>
or <a href="http://example.com/">example.com</a>.</p>
</body>
</html>
@@ -486,9 +486,9 @@
:meth:`XMLTreeBuilder.feed` calls *target*\'s :meth:`start` method
for each opening tag, its :meth:`end` method for each closing tag,
-and data is processed by method :meth:`data`. :meth:`XMLTreeBuilder.close`
-calls *target*\'s method :meth:`close`.
-:class:`XMLTreeBuilder` can be used not only for building a tree structure.
+and data is processed by method :meth:`data`. :meth:`XMLTreeBuilder.close`
+calls *target*\'s method :meth:`close`.
+:class:`XMLTreeBuilder` can be used not only for building a tree structure.
This is an example of counting the maximum depth of an XML file::
>>> from xml.etree.ElementTree import XMLTreeBuilder
@@ -496,16 +496,16 @@
... maxDepth = 0
... depth = 0
... def start(self, tag, attrib): # Called for each opening tag.
- ... self.depth += 1
+ ... self.depth += 1
... if self.depth > self.maxDepth:
... self.maxDepth = self.depth
... def end(self, tag): # Called for each closing tag.
... self.depth -= 1
- ... def data(self, data):
+ ... def data(self, data):
... pass # We do not need to do anything with data.
... def close(self): # Called when all data has been parsed.
... return self.maxDepth
- ...
+ ...
>>> target = MaxDepth()
>>> parser = XMLTreeBuilder(target=target)
>>> exampleXml = """
Modified: python/trunk/Doc/library/zipfile.rst
==============================================================================
--- python/trunk/Doc/library/zipfile.rst (original)
+++ python/trunk/Doc/library/zipfile.rst Sat Jan 3 21:55:06 2009
@@ -202,7 +202,7 @@
.. method:: ZipFile.extractall([path[, members[, pwd]]])
- Extract all members from the archive to the current working directory. *path*
+ Extract all members from the archive to the current working directory. *path*
specifies a different directory to extract to. *members* is optional and must
be a subset of the list returned by :meth:`namelist`. *pwd* is the password
used for encrypted files.
@@ -282,9 +282,9 @@
.. note::
- When passing a :class:`ZipInfo` instance as the *zinfo_or_acrname* parameter,
- the compression method used will be that specified in the *compress_type*
- member of the given :class:`ZipInfo` instance. By default, the
+ When passing a :class:`ZipInfo` instance as the *zinfo_or_acrname* parameter,
+ the compression method used will be that specified in the *compress_type*
+ member of the given :class:`ZipInfo` instance. By default, the
:class:`ZipInfo` constructor sets this member to :const:`ZIP_STORED`.
The following data attributes are also available:
@@ -298,9 +298,9 @@
.. attribute:: ZipFile.comment
- The comment text associated with the ZIP file. If assigning a comment to a
- :class:`ZipFile` instance created with mode 'a' or 'w', this should be a
- string no longer than 65535 bytes. Comments longer than this will be
+ The comment text associated with the ZIP file. If assigning a comment to a
+ :class:`ZipFile` instance created with mode 'a' or 'w', this should be a
+ string no longer than 65535 bytes. Comments longer than this will be
truncated in the written archive when :meth:`ZipFile.close` is called.
.. _pyzipfile-objects:
@@ -329,10 +329,10 @@
internal use only. The :meth:`writepy` method makes archives with file names
like this::
- string.pyc # Top level name
- test/__init__.pyc # Package directory
+ string.pyc # Top level name
+ test/__init__.pyc # Package directory
test/test_support.pyc # Module test.test_support
- test/bogus/__init__.pyc # Subpackage directory
+ test/bogus/__init__.pyc # Subpackage directory
test/bogus/myfile.pyc # Submodule test.bogus.myfile
Modified: python/trunk/Doc/library/zipimport.rst
==============================================================================
--- python/trunk/Doc/library/zipimport.rst (original)
+++ python/trunk/Doc/library/zipimport.rst Sat Jan 3 21:55:06 2009
@@ -148,7 +148,7 @@
-------- -------
8467 1 file
$ ./python
- Python 2.3 (#1, Aug 1 2003, 19:54:32)
+ Python 2.3 (#1, Aug 1 2003, 19:54:32)
>>> import sys
>>> sys.path.insert(0, '/tmp/example.zip') # Add .zip file to front of path
>>> import jwzthreading
Modified: python/trunk/Doc/license.rst
==============================================================================
--- python/trunk/Doc/license.rst (original)
+++ python/trunk/Doc/license.rst Sat Jan 3 21:55:06 2009
@@ -386,8 +386,8 @@
The source for the :mod:`fpectl` module includes the following notice::
- ---------------------------------------------------------------------
- / Copyright (c) 1996. \
+ ---------------------------------------------------------------------
+ / Copyright (c) 1996. \
| The Regents of the University of California. |
| All rights reserved. |
| |
@@ -419,7 +419,7 @@
| opinions of authors expressed herein do not necessarily state or |
| reflect those of the United States Government or the University |
| of California, and shall not be used for advertising or product |
- \ endorsement purposes. /
+ \ endorsement purposes. /
---------------------------------------------------------------------
Modified: python/trunk/Doc/reference/expressions.rst
==============================================================================
--- python/trunk/Doc/reference/expressions.rst (original)
+++ python/trunk/Doc/reference/expressions.rst Sat Jan 3 21:55:06 2009
@@ -560,7 +560,7 @@
.. productionlist::
slicing: `simple_slicing` | `extended_slicing`
simple_slicing: `primary` "[" `short_slice` "]"
- extended_slicing: `primary` "[" `slice_list` "]"
+ extended_slicing: `primary` "[" `slice_list` "]"
slice_list: `slice_item` ("," `slice_item`)* [","]
slice_item: `expression` | `proper_slice` | `ellipsis`
proper_slice: `short_slice` | `long_slice`
@@ -664,7 +664,7 @@
the call.
.. note::
-
+
An implementation may provide builtin functions whose positional parameters do
not have names, even if they are 'named' for the purpose of documentation, and
which therefore cannot be supplied by keyword. In CPython, this is the case for
@@ -1321,7 +1321,7 @@
.. rubric:: Footnotes
.. [#] In Python 2.3 and later releases, a list comprehension "leaks" the control
- variables of each ``for`` it contains into the containing scope. However, this
+ variables of each ``for`` it contains into the containing scope. However, this
behavior is deprecated, and relying on it will not work in Python 3.0
.. [#] While ``abs(x%y) < abs(y)`` is true mathematically, for floats it may not be
@@ -1354,7 +1354,7 @@
only, but this caused surprises because people expected to be able to test a
dictionary for emptiness by comparing it to ``{}``.
-.. [#] Due to automatic garbage-collection, free lists, and the dynamic nature of
+.. [#] Due to automatic garbage-collection, free lists, and the dynamic nature of
descriptors, you may notice seemingly unusual behaviour in certain uses of
the :keyword:`is` operator, like those involving comparisons between instance
methods, or constants. Check their documentation for more info.
Modified: python/trunk/Doc/reference/lexical_analysis.rst
==============================================================================
--- python/trunk/Doc/reference/lexical_analysis.rst (original)
+++ python/trunk/Doc/reference/lexical_analysis.rst Sat Jan 3 21:55:06 2009
@@ -341,13 +341,13 @@
language, and cannot be used as ordinary identifiers. They must be spelled
exactly as written here::
- and del from not while
- as elif global or with
- assert else if pass yield
- break except import print
- class exec in raise
- continue finally is return
- def for lambda try
+ and del from not while
+ as elif global or with
+ assert else if pass yield
+ break except import print
+ class exec in raise
+ continue finally is return
+ def for lambda try
.. versionchanged:: 2.4
:const:`None` became a constant and is now recognized by the compiler as a name
@@ -654,7 +654,7 @@
7 2147483647 0177
3L 79228162514264337593543950336L 0377L 0x100000000L
- 79228162514264337593543950336 0xdeadbeef
+ 79228162514264337593543950336 0xdeadbeef
.. _floating:
@@ -701,7 +701,7 @@
part, add a floating point number to it, e.g., ``(3+4j)``. Some examples of
imaginary literals::
- 3.14j 10.j 10j .001j 1e100j 3.14e-10j
+ 3.14j 10.j 10j .001j 1e100j 3.14e-10j
.. _operators:
Modified: python/trunk/Doc/reference/simple_stmts.rst
==============================================================================
--- python/trunk/Doc/reference/simple_stmts.rst (original)
+++ python/trunk/Doc/reference/simple_stmts.rst Sat Jan 3 21:55:06 2009
@@ -745,7 +745,7 @@
searched inside the package. A package is generally a subdirectory of a
directory on ``sys.path`` that has a file :file:`__init__.py`.
-..
+..
[XXX Can't be
bothered to spell this out right now; see the URL
http://www.python.org/doc/essays/packages.html for more details, also about how
Modified: python/trunk/Doc/tutorial/classes.rst
==============================================================================
--- python/trunk/Doc/tutorial/classes.rst (original)
+++ python/trunk/Doc/tutorial/classes.rst Sat Jan 3 21:55:06 2009
@@ -250,7 +250,7 @@
... def __init__(self, realpart, imagpart):
... self.r = realpart
... self.i = imagpart
- ...
+ ...
>>> x = Complex(3.0, -4.5)
>>> x.r, x.i
(3.0, -4.5)
@@ -481,7 +481,7 @@
``issubclass(unicode, str)`` is ``False`` since :class:`unicode` is not a
subclass of :class:`str` (they only share a common ancestor,
:class:`basestring`).
-
+
.. _tut-multiple:
@@ -743,7 +743,7 @@
f
l
o
- g
+ g
Anything that can be done with generators can also be done with class based
iterators as described in the previous section. What makes generators so
Modified: python/trunk/Doc/tutorial/controlflow.rst
==============================================================================
--- python/trunk/Doc/tutorial/controlflow.rst (original)
+++ python/trunk/Doc/tutorial/controlflow.rst Sat Jan 3 21:55:06 2009
@@ -62,7 +62,7 @@
... a = ['cat', 'window', 'defenestrate']
>>> for x in a:
... print x, len(x)
- ...
+ ...
cat 3
window 6
defenestrate 12
@@ -75,7 +75,7 @@
>>> for x in a[:]: # make a slice copy of the entire list
... if len(x) > 6: a.insert(0, x)
- ...
+ ...
>>> a
['defenestrate', 'cat', 'window', 'defenestrate']
@@ -110,7 +110,7 @@
>>> a = ['Mary', 'had', 'a', 'little', 'lamb']
>>> for i in range(len(a)):
... print i, a[i]
- ...
+ ...
0 Mary
1 had
2 a
@@ -146,7 +146,7 @@
... else:
... # loop fell through without finding a factor
... print n, 'is a prime number'
- ...
+ ...
2 is a prime number
3 is a prime number
4 equals 2 * 2
@@ -167,7 +167,7 @@
>>> while True:
... pass # Busy-wait for keyboard interrupt (Ctrl+C)
- ...
+ ...
This is commonly used for creating minimal classes::
@@ -181,7 +181,7 @@
>>> def initlog(*args):
... pass # Remember to implement this!
- ...
+ ...
.. _tut-functions:
@@ -197,7 +197,7 @@
... while b < n:
... print b,
... a, b = b, a+b
- ...
+ ...
>>> # Now call the function we just defined:
... fib(2000)
1 1 2 3 5 8 13 21 34 55 89 144 233 377 610 987 1597
@@ -268,7 +268,7 @@
... result.append(b) # see below
... a, b = b, a+b
... return result
- ...
+ ...
>>> f100 = fib2(100) # call it
>>> f100 # write the result
[1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89]
@@ -403,7 +403,7 @@
>>> def function(a):
... pass
- ...
+ ...
>>> function(0, a=0)
Traceback (most recent call last):
File "<stdin>", line 1, in ?
@@ -456,7 +456,7 @@
------------------------
.. index::
- statement: *
+ statement: *
Finally, the least frequently used option is to specify that a function can be
called with an arbitrary number of arguments. These arguments will be wrapped
@@ -565,11 +565,11 @@
>>> def my_function():
... """Do nothing, but document it.
- ...
+ ...
... No, really, it doesn't do anything.
... """
... pass
- ...
+ ...
>>> print my_function.__doc__
Do nothing, but document it.
Modified: python/trunk/Doc/tutorial/datastructures.rst
==============================================================================
--- python/trunk/Doc/tutorial/datastructures.rst (original)
+++ python/trunk/Doc/tutorial/datastructures.rst Sat Jan 3 21:55:06 2009
@@ -214,7 +214,7 @@
>>> def sum(seq):
... def add(x,y): return x+y
... return reduce(add, seq, 0)
- ...
+ ...
>>> sum(range(1, 11))
55
>>> sum([])
@@ -281,7 +281,7 @@
powerful tool but -- like all powerful tools -- they need to be used carefully,
if at all.
-Consider the following example of a 3x3 matrix held as a list containing three
+Consider the following example of a 3x3 matrix held as a list containing three
lists, one list per row::
>>> mat = [
@@ -290,7 +290,7 @@
... [7, 8, 9],
... ]
-Now, if you wanted to swap rows and columns, you could use a list
+Now, if you wanted to swap rows and columns, you could use a list
comprehension::
>>> print [[row[i] for row in mat] for i in [0, 1, 2]]
@@ -308,7 +308,7 @@
print row[i],
print
-In real world, you should prefer builtin functions to complex flow statements.
+In real world, you should prefer builtin functions to complex flow statements.
The :func:`zip` function would do a great job for this use case::
>>> zip(*mat)
@@ -551,7 +551,7 @@
>>> answers = ['lancelot', 'the holy grail', 'blue']
>>> for q, a in zip(questions, answers):
... print 'What is your {0}? It is {1}.'.format(q, a)
- ...
+ ...
What is your name? It is lancelot.
What is your quest? It is the holy grail.
What is your favorite color? It is blue.
@@ -574,7 +574,7 @@
>>> basket = ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
>>> for f in sorted(set(basket)):
... print f
- ...
+ ...
apple
banana
orange
Modified: python/trunk/Doc/tutorial/errors.rst
==============================================================================
--- python/trunk/Doc/tutorial/errors.rst (original)
+++ python/trunk/Doc/tutorial/errors.rst Sat Jan 3 21:55:06 2009
@@ -91,7 +91,7 @@
... break
... except ValueError:
... print "Oops! That was no valid number. Try again..."
- ...
+ ...
The :keyword:`try` statement works as follows.
@@ -199,12 +199,12 @@
>>> def this_fails():
... x = 1/0
- ...
+ ...
>>> try:
... this_fails()
... except ZeroDivisionError as detail:
... print 'Handling run-time error:', detail
- ...
+ ...
Handling run-time error: integer division or modulo by zero
@@ -256,12 +256,12 @@
... self.value = value
... def __str__(self):
... return repr(self.value)
- ...
+ ...
>>> try:
... raise MyError(2*2)
... except MyError as e:
... print 'My exception occurred, value:', e.value
- ...
+ ...
My exception occurred, value: 4
>>> raise MyError, 'oops!'
Traceback (most recent call last):
@@ -331,7 +331,7 @@
... raise KeyboardInterrupt
... finally:
... print 'Goodbye, world!'
- ...
+ ...
Goodbye, world!
Traceback (most recent call last):
File "<stdin>", line 2, in ?
Modified: python/trunk/Doc/tutorial/index.rst
==============================================================================
--- python/trunk/Doc/tutorial/index.rst (original)
+++ python/trunk/Doc/tutorial/index.rst Sat Jan 3 21:55:06 2009
@@ -1,7 +1,7 @@
.. _tutorial-index:
######################
- The Python Tutorial
+ The Python Tutorial
######################
:Release: |version|
Modified: python/trunk/Doc/tutorial/inputoutput.rst
==============================================================================
--- python/trunk/Doc/tutorial/inputoutput.rst (original)
+++ python/trunk/Doc/tutorial/inputoutput.rst Sat Jan 3 21:55:06 2009
@@ -87,7 +87,7 @@
>>> for x in range(1,11):
... print '{0:2d} {1:3d} {2:4d}'.format(x, x*x, x*x*x)
- ...
+ ...
1 1 1
2 4 8
3 9 27
@@ -162,7 +162,7 @@
>>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 7678}
>>> for name, phone in table.items():
... print '{0:10} ==> {1:10d}'.format(name, phone)
- ...
+ ...
Jack ==> 4098
Dcab ==> 7678
Sjoerd ==> 4127
@@ -330,7 +330,7 @@
>>> f = open('/tmp/workfile', 'r+')
>>> f.write('0123456789abcdef')
>>> f.seek(5) # Go to the 6th byte in the file
- >>> f.read(1)
+ >>> f.read(1)
'5'
>>> f.seek(-3, 2) # Go to the 3rd byte before the end
>>> f.read(1)
Modified: python/trunk/Doc/tutorial/interpreter.rst
==============================================================================
--- python/trunk/Doc/tutorial/interpreter.rst (original)
+++ python/trunk/Doc/tutorial/interpreter.rst Sat Jan 3 21:55:06 2009
@@ -112,7 +112,7 @@
>>> the_world_is_flat = 1
>>> if the_world_is_flat:
... print "Be careful not to fall off!"
- ...
+ ...
Be careful not to fall off!
@@ -180,7 +180,7 @@
best way to do it is to put one more special comment line right after the ``#!``
line to define the source file encoding::
- # -*- coding: encoding -*-
+ # -*- coding: encoding -*-
With that declaration, all characters in the source file will be treated as
Modified: python/trunk/Doc/tutorial/introduction.rst
==============================================================================
--- python/trunk/Doc/tutorial/introduction.rst (original)
+++ python/trunk/Doc/tutorial/introduction.rst Sat Jan 3 21:55:06 2009
@@ -84,7 +84,7 @@
>>> # try to access an undefined variable
... n
- Traceback (most recent call last):
+ Traceback (most recent call last):
File "<stdin>", line 1, in <module>
NameError: name 'n' is not defined
@@ -219,14 +219,14 @@
they will be included in the string. ::
print """
- Usage: thingy [OPTIONS]
+ Usage: thingy [OPTIONS]
-h Display this usage message
-H hostname Hostname to connect to
"""
produces the following output::
- Usage: thingy [OPTIONS]
+ Usage: thingy [OPTIONS]
-h Display this usage message
-H hostname Hostname to connect to
@@ -350,10 +350,10 @@
Then the right edge of the last character of a string of *n* characters has
index *n*, for example::
- +---+---+---+---+---+
+ +---+---+---+---+---+
| H | e | l | p | A |
- +---+---+---+---+---+
- 0 1 2 3 4 5
+ +---+---+---+---+---+
+ 0 1 2 3 4 5
-5 -4 -3 -2 -1
The first row of numbers gives the position of the indices 0...5 in the string;
@@ -595,7 +595,7 @@
>>> while b < 10:
... print b
... a, b = b, a+b
- ...
+ ...
1
1
2
@@ -645,7 +645,7 @@
>>> while b < 1000:
... print b,
... a, b = b, a+b
- ...
+ ...
1 1 2 3 5 8 13 21 34 55 89 144 233 377 610 987
Note that the interpreter inserts a newline before it prints the next prompt if
Modified: python/trunk/Doc/tutorial/modules.rst
==============================================================================
--- python/trunk/Doc/tutorial/modules.rst (original)
+++ python/trunk/Doc/tutorial/modules.rst Sat Jan 3 21:55:06 2009
@@ -281,7 +281,7 @@
['__name__', 'fib', 'fib2']
>>> dir(sys)
['__displayhook__', '__doc__', '__excepthook__', '__name__', '__stderr__',
- '__stdin__', '__stdout__', '_getframe', 'api_version', 'argv',
+ '__stdin__', '__stdout__', '_getframe', 'api_version', 'argv',
'builtin_module_names', 'byteorder', 'callstats', 'copyright',
'displayhook', 'exc_clear', 'exc_info', 'exc_type', 'excepthook',
'exec_prefix', 'executable', 'exit', 'getdefaultencoding', 'getdlopenflags',
@@ -314,7 +314,7 @@
'FloatingPointError', 'FutureWarning', 'IOError', 'ImportError',
'IndentationError', 'IndexError', 'KeyError', 'KeyboardInterrupt',
'LookupError', 'MemoryError', 'NameError', 'None', 'NotImplemented',
- 'NotImplementedError', 'OSError', 'OverflowError',
+ 'NotImplementedError', 'OSError', 'OverflowError',
'PendingDeprecationWarning', 'ReferenceError', 'RuntimeError',
'RuntimeWarning', 'StandardError', 'StopIteration', 'SyntaxError',
'SyntaxWarning', 'SystemError', 'SystemExit', 'TabError', 'True',
Modified: python/trunk/Doc/tutorial/stdlib.rst
==============================================================================
--- python/trunk/Doc/tutorial/stdlib.rst (original)
+++ python/trunk/Doc/tutorial/stdlib.rst Sat Jan 3 21:55:06 2009
@@ -136,7 +136,7 @@
>>> random.random() # random float
0.17970987693706186
>>> random.randrange(6) # random integer chosen from range(6)
- 4
+ 4
.. _tut-internet-access:
Modified: python/trunk/Doc/tutorial/whatnow.rst
==============================================================================
--- python/trunk/Doc/tutorial/whatnow.rst (original)
+++ python/trunk/Doc/tutorial/whatnow.rst Sat Jan 3 21:55:06 2009
@@ -63,6 +63,6 @@
.. Postings figure based on average of last six months activity as
reported by www.egroups.com; Jan. 2000 - June 2000: 21272 msgs / 182
- days = 116.9 msgs / day and steadily increasing. (XXX up to date figures?)
+ days = 116.9 msgs / day and steadily increasing. (XXX up to date figures?)
Modified: python/trunk/Doc/using/cmdline.rst
==============================================================================
--- python/trunk/Doc/using/cmdline.rst (original)
+++ python/trunk/Doc/using/cmdline.rst Sat Jan 3 21:55:06 2009
@@ -8,8 +8,8 @@
The CPython interpreter scans the command line and the environment for various
settings.
-.. note::
-
+.. note::
+
Other implementations' command line schemes may differ. See
:ref:`implementations` for further resources.
@@ -61,7 +61,7 @@
Execute the Python code in *command*. *command* can be one ore more
statements separated by newlines, with significant leading whitespace as in
normal module code.
-
+
If this option is given, the first element of :data:`sys.argv` will be
``"-c"`` and the current directory will be added to the start of
:data:`sys.path` (allowing modules in that directory to be imported as top
@@ -72,7 +72,7 @@
Search :data:`sys.path` for the named module and execute its contents as
the :mod:`__main__` module.
-
+
Since the argument is a *module* name, you must not give a file extension
(``.py``). The ``module-name`` should be a valid Python module name, but
the implementation may not always enforce this (e.g. it may allow you to
@@ -84,18 +84,18 @@
written in C, since they do not have Python module files. However, it
can still be used for precompiled modules, even if the original source
file is not available.
-
+
If this option is given, the first element of :data:`sys.argv` will be the
full path to the module file. As with the :option:`-c` option, the current
directory will be added to the start of :data:`sys.path`.
-
+
Many standard library modules contain code that is invoked on their execution
as a script. An example is the :mod:`timeit` module::
python -mtimeit -s 'setup here' 'benchmarked code here'
python -mtimeit -h # for details
- .. seealso::
+ .. seealso::
:func:`runpy.run_module`
The actual implementation of this feature.
@@ -163,7 +163,7 @@
--version
Print the Python version number and exit. Example output could be::
-
+
Python 2.5.1
.. versionchanged:: 2.5
@@ -201,7 +201,7 @@
enter interactive mode after executing the script or the command, even when
:data:`sys.stdin` does not appear to be a terminal. The
:envvar:`PYTHONSTARTUP` file is not read.
-
+
This can be useful to inspect global variables or a stack trace when a script
raises an exception. See also :envvar:`PYTHONINSPECT`.
@@ -221,7 +221,7 @@
.. cmdoption:: -Q <arg>
Division control. The argument must be one of the following:
-
+
``old``
division of int/int and long/long return an int or long (*default*)
``new``
@@ -264,10 +264,10 @@
.. cmdoption:: -u
-
+
Force stdin, stdout and stderr to be totally unbuffered. On systems where it
matters, also put stdin, stdout and stderr in binary mode.
-
+
Note that there is internal buffering in :meth:`file.readlines` and
:ref:`bltin-file-objects` (``for line in sys.stdin``) which is not influenced
by this option. To work around this, you will want to use
@@ -279,7 +279,7 @@
.. XXX should the -U option be documented?
.. cmdoption:: -v
-
+
Print a message each time a module is initialized, showing the place
(filename or built-in module) from which it is loaded. When given twice
(:option:`-vv`), print a message for each file that is checked for when
@@ -288,13 +288,13 @@
.. cmdoption:: -W arg
-
+
Warning control. Python's warning machinery by default prints warning
messages to :data:`sys.stderr`. A typical warning message has the following
form::
file:line: category: message
-
+
By default, each warning is printed once for each source line where it
occurs. This option controls how often warnings are printed.
@@ -302,13 +302,13 @@
one option, the action for the last matching option is performed. Invalid
:option:`-W` options are ignored (though, a warning message is printed about
invalid options when the first warning is issued).
-
+
Warnings can also be controlled from within a Python program using the
:mod:`warnings` module.
The simplest form of argument is one of the following action strings (or a
unique abbreviation):
-
+
``ignore``
Ignore all warnings.
``default``
@@ -324,9 +324,9 @@
Print each warning only the first time it occurs in the program.
``error``
Raise an exception instead of printing a warning message.
-
- The full form of argument is::
-
+
+ The full form of argument is::
+
action:message:category:module:line
Here, *action* is as explained above but only applies to messages that match
@@ -347,10 +347,10 @@
.. cmdoption:: -x
-
+
Skip the first line of the source, allowing use of non-Unix forms of
``#!cmd``. This is intended for a DOS specific hack only.
-
+
.. warning:: The line numbers in error messages will be off by one!
@@ -380,13 +380,13 @@
These environment variables influence Python's behavior.
.. envvar:: PYTHONHOME
-
+
Change the location of the standard Python libraries. By default, the
libraries are searched in :file:`{prefix}/lib/python{version}` and
:file:`{exec_prefix}/lib/python{version}`, where :file:`{prefix}` and
:file:`{exec_prefix}` are installation-dependent directories, both defaulting
to :file:`/usr/local`.
-
+
When :envvar:`PYTHONHOME` is set to a single directory, its value replaces
both :file:`{prefix}` and :file:`{exec_prefix}`. To specify different values
for these, set :envvar:`PYTHONHOME` to :file:`{prefix}:{exec_prefix}`.
@@ -402,11 +402,11 @@
In addition to normal directories, individual :envvar:`PYTHONPATH` entries
may refer to zipfiles containing pure Python modules (in either source or
compiled form). Extension modules cannot be imported from zipfiles.
-
+
The default search path is installation dependent, but generally begins with
:file:`{prefix}/lib/python{version}` (see :envvar:`PYTHONHOME` above). It
is *always* appended to :envvar:`PYTHONPATH`.
-
+
An additional directory will be inserted in the search path in front of
:envvar:`PYTHONPATH` as described above under
:ref:`using-on-interface-options`. The search path can be manipulated from
@@ -414,7 +414,7 @@
.. envvar:: PYTHONSTARTUP
-
+
If this is the name of a readable file, the Python commands in that file are
executed before the first prompt is displayed in interactive mode. The file
is executed in the same namespace where interactive commands are executed so
@@ -424,7 +424,7 @@
.. envvar:: PYTHONY2K
-
+
Set this to a non-empty string to cause the :mod:`time` module to require
dates specified as strings to include 4-digit years, otherwise 2-digit years
are converted based on rules described in the :mod:`time` module
@@ -432,21 +432,21 @@
.. envvar:: PYTHONOPTIMIZE
-
+
If this is set to a non-empty string it is equivalent to specifying the
:option:`-O` option. If set to an integer, it is equivalent to specifying
:option:`-O` multiple times.
.. envvar:: PYTHONDEBUG
-
+
If this is set to a non-empty string it is equivalent to specifying the
:option:`-d` option. If set to an integer, it is equivalent to specifying
:option:`-d` multiple times.
.. envvar:: PYTHONINSPECT
-
+
If this is set to a non-empty string it is equivalent to specifying the
:option:`-i` option.
@@ -455,20 +455,20 @@
.. envvar:: PYTHONUNBUFFERED
-
+
If this is set to a non-empty string it is equivalent to specifying the
:option:`-u` option.
.. envvar:: PYTHONVERBOSE
-
+
If this is set to a non-empty string it is equivalent to specifying the
:option:`-v` option. If set to an integer, it is equivalent to specifying
:option:`-v` multiple times.
.. envvar:: PYTHONCASEOK
-
+
If this is set, Python ignores case in :keyword:`import` statements. This
only works on Windows.
Modified: python/trunk/Doc/using/unix.rst
==============================================================================
--- python/trunk/Doc/using/unix.rst (original)
+++ python/trunk/Doc/using/unix.rst Sat Jan 3 21:55:06 2009
@@ -19,7 +19,7 @@
package on all others. However there are certain features you might want to use
that are not available on your distro's package. You can easily compile the
latest version of Python from source.
-
+
In the event that Python doesn't come preinstalled and isn't in the repositories as
well, you can easily make packages for your own distro. Have a look at the
following links:
@@ -45,8 +45,8 @@
* OpenBSD users use::
- pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/4.2/packages/<insert your architecture here>/python-<version>.tgz
-
+ pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/4.2/packages/<insert your architecture here>/python-<version>.tgz
+
For example i386 users get the 2.5.1 version of Python using::
pkg_add ftp://ftp.openbsd.org/pub/OpenBSD/4.2/packages/i386/python-2.5.1p2.tgz
@@ -87,7 +87,7 @@
Python-related paths and files
==============================
-
+
These are subject to difference depending on local installation conventions;
:envvar:`prefix` (``${prefix}``) and :envvar:`exec_prefix` (``${exec_prefix}``)
are installation-dependent and should be interpreted as for GNU software; they
@@ -112,7 +112,7 @@
| | by the user module; not used by default |
| | or by most applications. |
+-----------------------------------------------+------------------------------------------+
-
+
Miscellaneous
=============
Modified: python/trunk/Doc/using/windows.rst
==============================================================================
--- python/trunk/Doc/using/windows.rst (original)
+++ python/trunk/Doc/using/windows.rst Sat Jan 3 21:55:06 2009
@@ -88,9 +88,9 @@
---------------------------------------
Windows has a built-in dialog for changing environment variables (following
-guide applies to XP classical view): Right-click the icon for your machine
-(usually located on your Desktop and called "My Computer") and choose
-:menuselection:`Properties` there. Then, open the :guilabel:`Advanced` tab
+guide applies to XP classical view): Right-click the icon for your machine
+(usually located on your Desktop and called "My Computer") and choose
+:menuselection:`Properties` there. Then, open the :guilabel:`Advanced` tab
and click the :guilabel:`Environment Variables` button.
In short, your path is:
@@ -193,11 +193,11 @@
#. Launch a command prompt.
#. Associate the correct file group with ``.py`` scripts::
-
+
assoc .py=Python.File
#. Redirect all Python files to the new executable::
-
+
ftype Python.File=C:\Path\to\pythonw.exe "%1" %*
Modified: python/trunk/Doc/whatsnew/2.0.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.0.rst (original)
+++ python/trunk/Doc/whatsnew/2.0.rst Sat Jan 3 21:55:06 2009
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.0
+ What's New in Python 2.0
****************************
:Author: A.M. Kuchling and Moshe Zadka
@@ -277,9 +277,9 @@
finding all the strings in the list containing a given substring. You could
write the following to do it::
- # Given the list L, make a list of all strings
+ # Given the list L, make a list of all strings
# containing the substring S.
- sublist = filter( lambda s, substring=S:
+ sublist = filter( lambda s, substring=S:
string.find(s, substring) != -1,
L)
@@ -291,7 +291,7 @@
List comprehensions have the form::
- [ expression for expr in sequence1
+ [ expression for expr in sequence1
for expr2 in sequence2 ...
for exprN in sequenceN
if condition ]
@@ -312,8 +312,8 @@
...
for exprN in sequenceN:
if (condition):
- # Append the value of
- # the expression to the
+ # Append the value of
+ # the expression to the
# resulting list.
This means that when there are multiple :keyword:`for`...\ :keyword:`in`
@@ -590,7 +590,7 @@
def f():
print "i=",i
- i = i + 1
+ i = i + 1
f()
Two new exceptions, :exc:`TabError` and :exc:`IndentationError`, have been
@@ -627,7 +627,7 @@
the following lines of code::
if dict.has_key( key ): return dict[key]
- else:
+ else:
dict[key] = []
return dict[key]
@@ -836,14 +836,14 @@
:file:`setup.py` can be just a few lines long::
from distutils.core import setup
- setup (name = "foo", version = "1.0",
+ setup (name = "foo", version = "1.0",
py_modules = ["module1", "module2"])
The :file:`setup.py` file isn't much more complicated if the software consists
of a few packages::
from distutils.core import setup
- setup (name = "foo", version = "1.0",
+ setup (name = "foo", version = "1.0",
packages = ["package", "package.subpackage"])
A C extension can be the most complicated case; here's an example taken from
@@ -860,7 +860,7 @@
'extensions/expat/xmltok/xmlrole.c',
]
)
- setup (name = "PyXML", version = "0.5.4",
+ setup (name = "PyXML", version = "0.5.4",
ext_modules =[ expat_extension ] )
The Distutils can also take care of creating source and binary distributions.
Modified: python/trunk/Doc/whatsnew/2.1.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.1.rst (original)
+++ python/trunk/Doc/whatsnew/2.1.rst Sat Jan 3 21:55:06 2009
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.1
+ What's New in Python 2.1
****************************
:Author: A.M. Kuchling
@@ -98,7 +98,7 @@
x = 1
def f():
# The next line is a syntax error
- exec 'x=2'
+ exec 'x=2'
def g():
return x
Modified: python/trunk/Doc/whatsnew/2.2.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.2.rst (original)
+++ python/trunk/Doc/whatsnew/2.2.rst Sat Jan 3 21:55:06 2009
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.2
+ What's New in Python 2.2
****************************
:Author: A.M. Kuchling
@@ -473,7 +473,7 @@
Traceback (most recent call last):
File "<stdin>", line 1, in ?
StopIteration
- >>>
+ >>>
In 2.2, Python's :keyword:`for` statement no longer expects a sequence; it
expects something for which :func:`iter` will return an iterator. For backward
@@ -909,7 +909,7 @@
x = 1
def f():
# The next line is a syntax error
- exec 'x=2'
+ exec 'x=2'
def g():
return x
@@ -952,8 +952,8 @@
items = s.meerkat.getItems( {'channel': 4} )
# 'items' is another list of dictionaries, like this:
- # [{'link': 'http://freshmeat.net/releases/52719/',
- # 'description': 'A utility which converts HTML to XSL FO.',
+ # [{'link': 'http://freshmeat.net/releases/52719/',
+ # 'description': 'A utility which converts HTML to XSL FO.',
# 'title': 'html2fo 0.3 (Default)'}, ... ]
The :mod:`SimpleXMLRPCServer` module makes it easy to create straightforward
Modified: python/trunk/Doc/whatsnew/2.3.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.3.rst (original)
+++ python/trunk/Doc/whatsnew/2.3.rst Sat Jan 3 21:55:06 2009
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.3
+ What's New in Python 2.3
****************************
:Author: A.M. Kuchling
@@ -301,7 +301,7 @@
-------- -------
8467 1 file
amk at nyman:~/src/python$ ./python
- Python 2.3 (#1, Aug 1 2003, 19:54:32)
+ Python 2.3 (#1, Aug 1 2003, 19:54:32)
>>> import sys
>>> sys.path.insert(0, '/tmp/example.zip') # Add .zip file to front of path
>>> import jwzthreading
@@ -671,7 +671,7 @@
# ...
}
- if (hasattr(core, 'setup_keywords') and
+ if (hasattr(core, 'setup_keywords') and
'classifiers' in core.setup_keywords):
kw['classifiers'] = \
['Topic :: Internet :: WWW/HTTP :: Dynamic Content',
@@ -1027,7 +1027,7 @@
creating small dictionaries::
>>> dict(red=1, blue=2, green=3, black=4)
- {'blue': 2, 'black': 4, 'green': 3, 'red': 1}
+ {'blue': 2, 'black': 4, 'green': 3, 'red': 1}
(Contributed by Just van Rossum.)
@@ -1622,7 +1622,7 @@
... self.valuelist.pop(i)
... def keys(self):
... return list(self.keylist)
- ...
+ ...
>>> s = SeqDict()
>>> dir(s) # See that other dictionary methods are implemented
['__cmp__', '__contains__', '__delitem__', '__doc__', '__getitem__',
@@ -1779,7 +1779,7 @@
set input filename
-lLENGTH, --length=LENGTH
set maximum length of output
- $
+ $
See the module's documentation for more details.
Modified: python/trunk/Doc/whatsnew/2.4.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.4.rst (original)
+++ python/trunk/Doc/whatsnew/2.4.rst Sat Jan 3 21:55:06 2009
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.4
+ What's New in Python 2.4
****************************
:Author: A.M. Kuchling
@@ -63,10 +63,10 @@
>>> a.add('z') # add a new element
>>> a.update('wxy') # add multiple new elements
>>> a
- set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'x', 'z'])
+ set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'x', 'z'])
>>> a.remove('x') # take one element out
>>> a
- set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'z'])
+ set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'z'])
The :func:`frozenset` type is an immutable version of :func:`set`. Since it is
immutable and hashable, it may be used as a dictionary key or as a member of
@@ -351,7 +351,7 @@
>>> for i in reversed(xrange(1,4)):
... print i
- ...
+ ...
3
2
1
@@ -366,7 +366,7 @@
>>> input = open('/etc/passwd', 'r')
>>> for line in reversed(list(input)):
... print line
- ...
+ ...
root:*:0:0:System Administrator:/var/root:/bin/tcsh
...
@@ -650,7 +650,7 @@
28
>>> decimal.Decimal(1) / decimal.Decimal(7)
Decimal("0.1428571428571428571428571429")
- >>> decimal.getcontext().prec = 9
+ >>> decimal.getcontext().prec = 9
>>> decimal.Decimal(1) / decimal.Decimal(7)
Decimal("0.142857143")
@@ -665,7 +665,7 @@
>>> decimal.getcontext().traps[decimal.DivisionByZero] = False
>>> decimal.Decimal(1) / decimal.Decimal(0)
Decimal("Infinity")
- >>>
+ >>>
The :class:`Context` instance also has various methods for formatting numbers
such as :meth:`to_eng_string` and :meth:`to_sci_string`.
@@ -803,7 +803,7 @@
>>> 'www.python.org'.split('.', 1)
['www', 'python.org']
'www.python.org'.rsplit('.', 1)
- ['www.python', 'org']
+ ['www.python', 'org']
* Three keyword parameters, *cmp*, *key*, and *reverse*, were added to the
:meth:`sort` method of lists. These parameters make some common usages of
@@ -1045,7 +1045,7 @@
>>> list(d) # list the contents of the deque
['g', 'h', 'i']
>>> 'h' in d # search the deque
- True
+ True
Several modules, such as the :mod:`Queue` and :mod:`threading` modules, now take
advantage of :class:`collections.deque` for improved performance. (Contributed
@@ -1106,13 +1106,13 @@
>>> L = [2, 4, 6, 7, 8, 9, 11, 12, 14]
>>> for key_val, it in itertools.groupby(L, lambda x: x % 2):
... print key_val, list(it)
- ...
+ ...
0 [2, 4, 6]
1 [7]
0 [8]
1 [9, 11]
0 [12, 14]
- >>>
+ >>>
:func:`groupby` is typically used with sorted input. The logic for
:func:`groupby` is similar to the Unix ``uniq`` filter which makes it handy for
@@ -1120,21 +1120,21 @@
>>> word = 'abracadabra'
>>> letters = sorted(word) # Turn string into a sorted list of letters
- >>> letters
+ >>> letters
['a', 'a', 'a', 'a', 'a', 'b', 'b', 'c', 'd', 'r', 'r']
>>> for k, g in itertools.groupby(letters):
... print k, list(g)
- ...
+ ...
a ['a', 'a', 'a', 'a', 'a']
b ['b', 'b']
c ['c']
d ['d']
r ['r', 'r']
>>> # List unique letters
- >>> [k for k, g in groupby(letters)]
+ >>> [k for k, g in groupby(letters)]
['a', 'b', 'c', 'd', 'r']
>>> # Count letter occurrences
- >>> [(k, len(list(g))) for k, g in groupby(letters)]
+ >>> [(k, len(list(g))) for k, g in groupby(letters)]
[('a', 5), ('b', 2), ('c', 1), ('d', 1), ('r', 2)]
(Contributed by Hye-Shik Chang.)
@@ -1175,7 +1175,7 @@
import logging
logging.basicConfig(filename='/var/log/application.log',
level=0, # Log all messages
- format='%(levelname):%(process):%(thread):%(message)')
+ format='%(levelname):%(process):%(thread):%(message)')
Other additions to the :mod:`logging` package include a :meth:`log(level, msg)`
convenience method, as well as a :class:`TimedRotatingFileHandler` class that
Modified: python/trunk/Doc/whatsnew/2.5.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.5.rst (original)
+++ python/trunk/Doc/whatsnew/2.5.rst Sat Jan 3 21:55:06 2009
@@ -1,5 +1,5 @@
****************************
- What's New in Python 2.5
+ What's New in Python 2.5
****************************
:Author: A.M. Kuchling
@@ -220,7 +220,7 @@
required packages. ::
VERSION = '1.0'
- setup(name='PyPackage',
+ setup(name='PyPackage',
version=VERSION,
requires=['numarray', 'zlib (>=1.1.4)'],
obsoletes=['OldPackage']
@@ -388,7 +388,7 @@
else:
else-block
finally:
- final-block
+ final-block
The code in *block-1* is executed. If the code raises an exception, the various
:keyword:`except` blocks are tested: if the exception is of class
@@ -835,8 +835,8 @@
...
except (KeyboardInterrupt, SystemExit):
raise
- except:
- # Log error...
+ except:
+ # Log error...
# Continue running program...
In Python 2.5, you can now write ``except Exception`` to achieve the same
@@ -947,7 +947,7 @@
class C:
def __index__ (self):
- return self.value
+ return self.value
The return value must be either a Python integer or long integer. The
interpreter will check that the type returned is correct, and raises a
@@ -1035,9 +1035,9 @@
L = ['medium', 'longest', 'short']
# Prints 'longest'
- print max(L, key=len)
+ print max(L, key=len)
# Prints 'short', because lexicographically 'short' has the largest value
- print max(L)
+ print max(L)
(Contributed by Steven Bethard and Raymond Hettinger.)
@@ -1070,8 +1070,8 @@
using the default ASCII encoding. The result of the comparison is false::
>>> chr(128) == unichr(128) # Can't convert chr(128) to Unicode
- __main__:1: UnicodeWarning: Unicode equal comparison failed
- to convert both arguments to Unicode - interpreting them
+ __main__:1: UnicodeWarning: Unicode equal comparison failed
+ to convert both arguments to Unicode - interpreting them
as being unequal
False
>>> chr(127) == unichr(127) # chr(127) can be converted
@@ -1259,10 +1259,10 @@
Printing ``index`` results in the following output::
- defaultdict(<type 'list'>, {'c': ['cammin', 'che'], 'e': ['era'],
- 'd': ['del', 'di', 'diritta'], 'm': ['mezzo', 'mi'],
- 'l': ['la'], 'o': ['oscura'], 'n': ['nel', 'nostra'],
- 'p': ['per'], 's': ['selva', 'smarrita'],
+ defaultdict(<type 'list'>, {'c': ['cammin', 'che'], 'e': ['era'],
+ 'd': ['del', 'di', 'diritta'], 'm': ['mezzo', 'mi'],
+ 'l': ['la'], 'o': ['oscura'], 'n': ['nel', 'nostra'],
+ 'p': ['per'], 's': ['selva', 'smarrita'],
'r': ['ritrovai'], 'u': ['una'], 'v': ['vita', 'via']}
(Contributed by Guido van Rossum.)
@@ -1884,17 +1884,17 @@
differently. ::
# Old versions
- h = md5.md5()
- h = md5.new()
+ h = md5.md5()
+ h = md5.new()
- # New version
+ # New version
h = hashlib.md5()
# Old versions
- h = sha.sha()
- h = sha.new()
+ h = sha.sha()
+ h = sha.new()
- # New version
+ # New version
h = hashlib.sha1()
# Hash that weren't previously available
@@ -2191,7 +2191,7 @@
case that your extensions were using it, you can replace it by something like
the following::
- range = PyObject_CallFunction((PyObject*) &PyRange_Type, "lll",
+ range = PyObject_CallFunction((PyObject*) &PyRange_Type, "lll",
start, stop, step);
.. ======================================================================
Modified: python/trunk/Doc/whatsnew/2.6.rst
==============================================================================
--- python/trunk/Doc/whatsnew/2.6.rst (original)
+++ python/trunk/Doc/whatsnew/2.6.rst Sat Jan 3 21:55:06 2009
@@ -744,7 +744,7 @@
>>> import sys
>>> print 'Platform: {0.platform}\nPython version: {0.version}'.format(sys)
Platform: darwin
- Python version: 2.6a1+ (trunk:61261M, Mar 5 2008, 20:29:41)
+ Python version: 2.6a1+ (trunk:61261M, Mar 5 2008, 20:29:41)
[GCC 4.0.1 (Apple Computer, Inc. build 5367)]'
>>> import mimetypes
@@ -958,8 +958,8 @@
The primary use of :class:`bytes` in 2.6 will be to write tests of
object type such as ``isinstance(x, bytes)``. This will help the 2to3
converter, which can't tell whether 2.x code intends strings to
-contain either characters or 8-bit bytes; you can now
-use either :class:`bytes` or :class:`str` to represent your intention
+contain either characters or 8-bit bytes; you can now
+use either :class:`bytes` or :class:`str` to represent your intention
exactly, and the resulting code will also be correct in Python 3.0.
There's also a ``__future__`` import that causes all string literals
@@ -1834,9 +1834,9 @@
"/cgi-bin/add.py?category=1". (Contributed by Alexandre Fiori and
Nubis; :issue:`1817`.)
- The :func:`parse_qs` and :func:`parse_qsl` functions have been
+ The :func:`parse_qs` and :func:`parse_qsl` functions have been
relocated from the :mod:`cgi` module to the :mod:`urlparse` module.
- The versions still available in the :mod:`cgi` module will
+ The versions still available in the :mod:`cgi` module will
trigger :exc:`PendingDeprecationWarning` messages in 2.6
(:issue:`600362`).
@@ -1931,7 +1931,7 @@
* A new window method in the :mod:`curses` module,
:meth:`chgat`, changes the display attributes for a certain number of
characters on a single line. (Contributed by Fabian Kreutz.)
-
+
::
# Boldface text starting at y=0,x=21
@@ -2428,9 +2428,9 @@
:issue:`742598`, :issue:`1193577`.)
* The :mod:`sqlite3` module, maintained by Gerhard Haering,
- has been updated from version 2.3.2 in Python 2.5 to
+ has been updated from version 2.3.2 in Python 2.5 to
version 2.4.1.
-
+
* The :mod:`struct` module now supports the C99 :ctype:`_Bool` type,
using the format character ``'?'``.
(Contributed by David Remahl.)
@@ -2525,9 +2525,9 @@
``with tempfile.NamedTemporaryFile() as tmp: ...``.
(Contributed by Alexander Belopolsky; :issue:`2021`.)
-* The :mod:`test.test_support` module gained a number
- of context managers useful for writing tests.
- :func:`EnvironmentVarGuard` is a
+* The :mod:`test.test_support` module gained a number
+ of context managers useful for writing tests.
+ :func:`EnvironmentVarGuard` is a
context manager that temporarily changes environment variables and
automatically restores them to their old values.
@@ -2542,7 +2542,7 @@
f = urllib.urlopen('https://sf.net')
...
- Finally, :func:`check_warnings` resets the :mod:`warning` module's
+ Finally, :func:`check_warnings` resets the :mod:`warning` module's
warning filters and returns an object that will record all warning
messages triggered (:issue:`3781`)::
@@ -2582,7 +2582,7 @@
:meth:`activeCount` method is renamed to :meth:`active_count`. Both
the 2.6 and 3.0 versions of the module support the same properties
and renamed methods, but don't remove the old methods. No date has been set
- for the deprecation of the old APIs in Python 3.x; the old APIs won't
+ for the deprecation of the old APIs in Python 3.x; the old APIs won't
be removed in any 2.x version.
(Carried out by several people, most notably Benjamin Peterson.)
@@ -2639,7 +2639,7 @@
(Added by Facundo Batista.)
* The Unicode database provided by the :mod:`unicodedata` module
- has been updated to version 5.1.0. (Updated by
+ has been updated to version 5.1.0. (Updated by
Martin von Loewis; :issue:`3811`.)
* The :mod:`warnings` module's :func:`formatwarning` and :func:`showwarning`
@@ -2650,7 +2650,7 @@
A new function, :func:`catch_warnings`, is a context manager
intended for testing purposes that lets you temporarily modify the
warning filters and then restore their original values (:issue:`3781`).
-
+
* The XML-RPC :class:`SimpleXMLRPCServer` and :class:`DocXMLRPCServer`
classes can now be prevented from immediately opening and binding to
their socket by passing True as the ``bind_and_activate``
@@ -3220,8 +3220,8 @@
* :meth:`object.__init__` previously accepted arbitrary arguments and
keyword arguments, ignoring them. In Python 2.6, this is no longer
- allowed and will result in a :exc:`TypeError`. This will affect
- :meth:`__init__` methods that end up calling the corresponding
+ allowed and will result in a :exc:`TypeError`. This will affect
+ :meth:`__init__` methods that end up calling the corresponding
method on :class:`object` (perhaps through using :func:`super`).
See :issue:`1683368` for discussion.
@@ -3281,7 +3281,7 @@
The author would like to thank the following people for offering
suggestions, corrections and assistance with various drafts of this
-article: Georg Brandl, Steve Brown, Nick Coghlan, Ralph Corderoy,
-Jim Jewett, Kent Johnson, Chris Lambacher, Martin Michlmayr,
+article: Georg Brandl, Steve Brown, Nick Coghlan, Ralph Corderoy,
+Jim Jewett, Kent Johnson, Chris Lambacher, Martin Michlmayr,
Antoine Pitrou, Brian Warner.
More information about the Python-checkins
mailing list