mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 77120,77151,77155,77209,77229,77256,77317,77331,77333,77359-77360,77382,77561,77570 via svnmerge from

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

........
  r77120 | georg.brandl | 2009-12-29 22:09:17 +0100 (Di, 29 Dez 2009) | 1 line

  #7595: fix typo in argument default constant.
........
  r77151 | georg.brandl | 2009-12-30 19:32:50 +0100 (Mi, 30 Dez 2009) | 1 line

  #7487: update Pygments version.
........
  r77155 | georg.brandl | 2009-12-30 20:03:00 +0100 (Mi, 30 Dez 2009) | 1 line

  We only support Windows NT derivatives now.
........
  r77209 | georg.brandl | 2010-01-01 14:07:05 +0100 (Fr, 01 Jan 2010) | 1 line

  More yearly updates.
........
  r77229 | georg.brandl | 2010-01-02 13:35:01 +0100 (Sa, 02 Jan 2010) | 1 line

  Fix casing.
........
  r77256 | georg.brandl | 2010-01-02 23:55:55 +0100 (Sa, 02 Jan 2010) | 1 line

  Fix typo.
........
  r77317 | georg.brandl | 2010-01-05 19:14:52 +0100 (Di, 05 Jan 2010) | 1 line

  Add Stefan.
........
  r77331 | georg.brandl | 2010-01-06 18:43:06 +0100 (Mi, 06 Jan 2010) | 1 line

  Small fixes to test_cmd: fix signature of do_shell, remove duplicate import, add option to run the custom Cmd class.
........
  r77333 | georg.brandl | 2010-01-06 19:26:08 +0100 (Mi, 06 Jan 2010) | 1 line

  #5950: document that zip files with comments are unsupported in zipimport.
........
  r77359 | georg.brandl | 2010-01-07 21:54:45 +0100 (Do, 07 Jan 2010) | 1 line

  Fix description for Py_GetPath(); it sounded like it always returned sys.path.
........
  r77360 | georg.brandl | 2010-01-07 22:48:47 +0100 (Do, 07 Jan 2010) | 1 line

  #7653: clarify how the PythonPath registry key should look like.
........
  r77382 | georg.brandl | 2010-01-09 10:47:11 +0100 (Sa, 09 Jan 2010) | 1 line

  #7422: make it clear that getargspec() only works on Python functions.
........
  r77561 | georg.brandl | 2010-01-17 09:42:30 +0100 (So, 17 Jan 2010) | 1 line

  #7699: improve datetime docs: straightforward linking to strftime/strptime section, mark classmethods as such.
........
  r77570 | georg.brandl | 2010-01-17 13:14:42 +0100 (So, 17 Jan 2010) | 1 line

  Add note about usage of STRINGLIB_EMPTY.
........
This commit is contained in:
Georg Brandl 2010-03-21 19:16:28 +00:00
parent 9fed6d8d49
commit b6453a902e
21 changed files with 107 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Doc/c-api/init.rst
View file

@ -258,13 +258,14 @@ Initialization, Finalization, and Threads
single: path (in module sys) single: path (in module sys)
Return the default module search path; this is computed from the program name Return the default module search path; this is computed from the program name
(set by :cfunc:`Py_SetProgramName` above) and some environment variables. The (set by :cfunc:`Py_SetProgramName` above) and some environment variables.
returned string consists of a series of directory names separated by a platform The returned string consists of a series of directory names separated by a
dependent delimiter character. The delimiter character is ``':'`` on Unix and platform dependent delimiter character. The delimiter character is ``':'``
Mac OS X, ``';'`` on Windows. The returned string points into static storage; on Unix and Mac OS X, ``';'`` on Windows. The returned string points into
the caller should not modify its value. The value is available to Python code static storage; the caller should not modify its value. The list
as the list ``sys.path``, which may be modified to change the future search path :data:`sys.path` is initialized with this value on interpreter startup; it
for loaded modules. can be (and usually is) modified later to change the search path for loading
modules.
.. XXX should give the exact rules .. XXX should give the exact rules

82
Doc/library/datetime.rst
View file

@ -38,7 +38,6 @@ than rational, and there is no standard suitable for every application.
The :mod:`datetime` module exports the following constants: The :mod:`datetime` module exports the following constants:
.. data:: MINYEAR .. data:: MINYEAR
The smallest year number allowed in a :class:`date` or :class:`datetime` object. The smallest year number allowed in a :class:`date` or :class:`datetime` object.
@ -63,7 +62,6 @@ The :mod:`datetime` module exports the following constants:
Available Types Available Types
--------------- ---------------
.. class:: date .. class:: date
:noindex: :noindex:
@ -133,7 +131,6 @@ Subclass relationships::
A :class:`timedelta` object represents a duration, the difference between two A :class:`timedelta` object represents a duration, the difference between two
dates or times. dates or times.
.. class:: timedelta([days[, seconds[, microseconds[, milliseconds[, minutes[, hours[, weeks]]]]]]]) .. class:: timedelta([days[, seconds[, microseconds[, milliseconds[, minutes[, hours[, weeks]]]]]]])
All arguments are optional and default to ``0``. Arguments may be ints, longs, All arguments are optional and default to ``0``. Arguments may be ints, longs,
@ -170,8 +167,8 @@ dates or times.
>>> (d.days, d.seconds, d.microseconds) >>> (d.days, d.seconds, d.microseconds)
(-1, 86399, 999999) (-1, 86399, 999999)
Class attributes are:
Class attributes are:
.. attribute:: timedelta.min .. attribute:: timedelta.min
@ -316,16 +313,16 @@ systems.
If an argument outside those ranges is given, :exc:`ValueError` is raised. If an argument outside those ranges is given, :exc:`ValueError` is raised.
Other constructors, all class methods: Other constructors, all class methods:
.. classmethod:: date.today()
.. method:: date.today()
Return the current local date. This is equivalent to Return the current local date. This is equivalent to
``date.fromtimestamp(time.time())``. ``date.fromtimestamp(time.time())``.
.. method:: date.fromtimestamp(timestamp) .. classmethod:: date.fromtimestamp(timestamp)
Return the local date corresponding to the POSIX timestamp, such as is returned Return the local date corresponding to the POSIX timestamp, such as is returned
by :func:`time.time`. This may raise :exc:`ValueError`, if the timestamp is out by :func:`time.time`. This may raise :exc:`ValueError`, if the timestamp is out
@ -335,15 +332,15 @@ Other constructors, all class methods:
timestamp, leap seconds are ignored by :meth:`fromtimestamp`. timestamp, leap seconds are ignored by :meth:`fromtimestamp`.
.. method:: date.fromordinal(ordinal) .. classmethod:: date.fromordinal(ordinal)
Return the date corresponding to the proleptic Gregorian ordinal, where January Return the date corresponding to the proleptic Gregorian ordinal, where January
1 of year 1 has ordinal 1. :exc:`ValueError` is raised unless ``1 <= ordinal <= 1 of year 1 has ordinal 1. :exc:`ValueError` is raised unless ``1 <= ordinal <=
date.max.toordinal()``. For any date *d*, ``date.fromordinal(d.toordinal()) == date.max.toordinal()``. For any date *d*, ``date.fromordinal(d.toordinal()) ==
d``. d``.
Class attributes:
Class attributes:
.. attribute:: date.min .. attribute:: date.min
@ -360,8 +357,8 @@ Class attributes:
The smallest possible difference between non-equal date objects, The smallest possible difference between non-equal date objects,
``timedelta(days=1)``. ``timedelta(days=1)``.
Instance attributes (read-only):
Instance attributes (read-only):
.. attribute:: date.year .. attribute:: date.year
@ -377,6 +374,7 @@ Instance attributes (read-only):
Between 1 and the number of days in the given month of the given year. Between 1 and the number of days in the given month of the given year.
Supported operations: Supported operations:
+-------------------------------+----------------------------------------------+ +-------------------------------+----------------------------------------------+
@ -429,7 +427,6 @@ objects are considered to be true.
Instance methods: Instance methods:
.. method:: date.replace(year, month, day) .. method:: date.replace(year, month, day)
Return a date with the same value, except for those members given new values by Return a date with the same value, except for those members given new values by
@ -509,7 +506,8 @@ Instance methods:
Return a string representing the date, controlled by an explicit format string. Return a string representing the date, controlled by an explicit format string.
Format codes referring to hours, minutes or seconds will see 0 values. See Format codes referring to hours, minutes or seconds will see 0 values. See
section :ref:`strftime-behavior`. section :ref:`strftime-strptime-behavior`.
Example of counting days to an event:: Example of counting days to an event::
@ -576,7 +574,6 @@ both directions; like a time object, :class:`datetime` assumes there are exactly
Constructor: Constructor:
.. class:: datetime(year, month, day[, hour[, minute[, second[, microsecond[, tzinfo]]]]]) .. class:: datetime(year, month, day[, hour[, minute[, second[, microsecond[, tzinfo]]]]])
The year, month and day arguments are required. *tzinfo* may be ``None``, or an The year, month and day arguments are required. *tzinfo* may be ``None``, or an
@ -595,15 +592,14 @@ Constructor:
Other constructors, all class methods: Other constructors, all class methods:
.. classmethod:: datetime.today()
.. method:: datetime.today()
Return the current local datetime, with :attr:`tzinfo` ``None``. This is Return the current local datetime, with :attr:`tzinfo` ``None``. This is
equivalent to ``datetime.fromtimestamp(time.time())``. See also :meth:`now`, equivalent to ``datetime.fromtimestamp(time.time())``. See also :meth:`now`,
:meth:`fromtimestamp`. :meth:`fromtimestamp`.
.. method:: datetime.now([tz]) .. classmethod:: datetime.now([tz])
Return the current local date and time. If optional argument *tz* is ``None`` Return the current local date and time. If optional argument *tz* is ``None``
or not specified, this is like :meth:`today`, but, if possible, supplies more or not specified, this is like :meth:`today`, but, if possible, supplies more
@ -617,14 +613,14 @@ Other constructors, all class methods:
See also :meth:`today`, :meth:`utcnow`. See also :meth:`today`, :meth:`utcnow`.
.. method:: datetime.utcnow() .. classmethod:: datetime.utcnow()
Return the current UTC date and time, with :attr:`tzinfo` ``None``. This is like Return the current UTC date and time, with :attr:`tzinfo` ``None``. This is like
:meth:`now`, but returns the current UTC date and time, as a naive :meth:`now`, but returns the current UTC date and time, as a naive
:class:`datetime` object. See also :meth:`now`. :class:`datetime` object. See also :meth:`now`.
.. method:: datetime.fromtimestamp(timestamp[, tz]) .. classmethod:: datetime.fromtimestamp(timestamp[, tz])
Return the local date and time corresponding to the POSIX timestamp, such as is Return the local date and time corresponding to the POSIX timestamp, such as is
returned by :func:`time.time`. If optional argument *tz* is ``None`` or not returned by :func:`time.time`. If optional argument *tz* is ``None`` or not
@ -645,7 +641,7 @@ Other constructors, all class methods:
identical :class:`datetime` objects. See also :meth:`utcfromtimestamp`. identical :class:`datetime` objects. See also :meth:`utcfromtimestamp`.
.. method:: datetime.utcfromtimestamp(timestamp) .. classmethod:: datetime.utcfromtimestamp(timestamp)
Return the UTC :class:`datetime` corresponding to the POSIX timestamp, with Return the UTC :class:`datetime` corresponding to the POSIX timestamp, with
:attr:`tzinfo` ``None``. This may raise :exc:`ValueError`, if the timestamp is :attr:`tzinfo` ``None``. This may raise :exc:`ValueError`, if the timestamp is
@ -654,7 +650,7 @@ Other constructors, all class methods:
:meth:`fromtimestamp`. :meth:`fromtimestamp`.
.. method:: datetime.fromordinal(ordinal) .. classmethod:: datetime.fromordinal(ordinal)
Return the :class:`datetime` corresponding to the proleptic Gregorian ordinal, Return the :class:`datetime` corresponding to the proleptic Gregorian ordinal,
where January 1 of year 1 has ordinal 1. :exc:`ValueError` is raised unless ``1 where January 1 of year 1 has ordinal 1. :exc:`ValueError` is raised unless ``1
@ -662,7 +658,7 @@ Other constructors, all class methods:
microsecond of the result are all 0, and :attr:`tzinfo` is ``None``. microsecond of the result are all 0, and :attr:`tzinfo` is ``None``.
.. method:: datetime.combine(date, time) .. classmethod:: datetime.combine(date, time)
Return a new :class:`datetime` object whose date members are equal to the given Return a new :class:`datetime` object whose date members are equal to the given
:class:`date` object's, and whose time and :attr:`tzinfo` members are equal to :class:`date` object's, and whose time and :attr:`tzinfo` members are equal to
@ -671,18 +667,18 @@ Other constructors, all class methods:
object, its time and :attr:`tzinfo` members are ignored. object, its time and :attr:`tzinfo` members are ignored.
.. method:: datetime.strptime(date_string, format) .. classmethod:: datetime.strptime(date_string, format)
Return a :class:`datetime` corresponding to *date_string*, parsed according to Return a :class:`datetime` corresponding to *date_string*, parsed according to
*format*. This is equivalent to ``datetime(*(time.strptime(date_string, *format*. This is equivalent to ``datetime(*(time.strptime(date_string,
format)[0:6]))``. :exc:`ValueError` is raised if the date_string and format format)[0:6]))``. :exc:`ValueError` is raised if the date_string and format
can't be parsed by :func:`time.strptime` or if it returns a value which isn't a can't be parsed by :func:`time.strptime` or if it returns a value which isn't a
time tuple. time tuple. See section :ref:`strftime-strptime-behavior`.
.. versionadded:: 2.5 .. versionadded:: 2.5
Class attributes:
Class attributes:
.. attribute:: datetime.min .. attribute:: datetime.min
@ -701,8 +697,8 @@ Class attributes:
The smallest possible difference between non-equal :class:`datetime` objects, The smallest possible difference between non-equal :class:`datetime` objects,
``timedelta(microseconds=1)``. ``timedelta(microseconds=1)``.
Instance attributes (read-only):
Instance attributes (read-only):
.. attribute:: datetime.year .. attribute:: datetime.year
@ -744,6 +740,7 @@ Instance attributes (read-only):
The object passed as the *tzinfo* argument to the :class:`datetime` constructor, The object passed as the *tzinfo* argument to the :class:`datetime` constructor,
or ``None`` if none was passed. or ``None`` if none was passed.
Supported operations: Supported operations:
+---------------------------------------+-------------------------------+ +---------------------------------------+-------------------------------+
@ -817,7 +814,6 @@ all :class:`datetime` objects are considered to be true.
Instance methods: Instance methods:
.. method:: datetime.date() .. method:: datetime.date()
Return :class:`date` object with same year, month and day. Return :class:`date` object with same year, month and day.
@ -995,7 +991,8 @@ Instance methods:
.. method:: datetime.strftime(format) .. method:: datetime.strftime(format)
Return a string representing the date and time, controlled by an explicit format Return a string representing the date and time, controlled by an explicit format
string. See section :ref:`strftime-behavior`. string. See section :ref:`strftime-strptime-behavior`.
Examples of working with datetime objects: Examples of working with datetime objects:
@ -1108,7 +1105,6 @@ Using datetime with tzinfo:
A time object represents a (local) time of day, independent of any particular A time object represents a (local) time of day, independent of any particular
day, and subject to adjustment via a :class:`tzinfo` object. day, and subject to adjustment via a :class:`tzinfo` object.
.. class:: time(hour[, minute[, second[, microsecond[, tzinfo]]]]) .. class:: time(hour[, minute[, second[, microsecond[, tzinfo]]]])
All arguments are optional. *tzinfo* may be ``None``, or an instance of a All arguments are optional. *tzinfo* may be ``None``, or an instance of a
@ -1142,8 +1138,8 @@ Class attributes:
``timedelta(microseconds=1)``, although note that arithmetic on :class:`time` ``timedelta(microseconds=1)``, although note that arithmetic on :class:`time`
objects is not supported. objects is not supported.
Instance attributes (read-only):
Instance attributes (read-only):
.. attribute:: time.hour .. attribute:: time.hour
@ -1170,6 +1166,7 @@ Instance attributes (read-only):
The object passed as the tzinfo argument to the :class:`time` constructor, or The object passed as the tzinfo argument to the :class:`time` constructor, or
``None`` if none was passed. ``None`` if none was passed.
Supported operations: Supported operations:
* comparison of :class:`time` to :class:`time`, where *a* is considered less * comparison of :class:`time` to :class:`time`, where *a* is considered less
@ -1192,8 +1189,8 @@ Supported operations:
only if, after converting it to minutes and subtracting :meth:`utcoffset` (or only if, after converting it to minutes and subtracting :meth:`utcoffset` (or
``0`` if that's ``None``), the result is non-zero. ``0`` if that's ``None``), the result is non-zero.
Instance methods:
Instance methods:
.. method:: time.replace([hour[, minute[, second[, microsecond[, tzinfo]]]]]) .. method:: time.replace([hour[, minute[, second[, microsecond[, tzinfo]]]]])
@ -1219,7 +1216,7 @@ Instance methods:
.. method:: time.strftime(format) .. method:: time.strftime(format)
Return a string representing the time, controlled by an explicit format string. Return a string representing the time, controlled by an explicit format string.
See section :ref:`strftime-behavior`. See section :ref:`strftime-strptime-behavior`.
.. method:: time.utcoffset() .. method:: time.utcoffset()
@ -1244,6 +1241,7 @@ Instance methods:
``self.tzinfo.tzname(None)``, or raises an exception if the latter doesn't ``self.tzinfo.tzname(None)``, or raises an exception if the latter doesn't
return ``None`` or a string object. return ``None`` or a string object.
Example: Example:
>>> from datetime import time, tzinfo >>> from datetime import time, tzinfo
@ -1380,6 +1378,7 @@ methods. Exactly which methods are needed depends on the uses made of aware
The default implementation of :meth:`tzname` raises :exc:`NotImplementedError`. The default implementation of :meth:`tzname` raises :exc:`NotImplementedError`.
These methods are called by a :class:`datetime` or :class:`time` object, in These methods are called by a :class:`datetime` or :class:`time` object, in
response to their methods of the same names. A :class:`datetime` object passes response to their methods of the same names. A :class:`datetime` object passes
itself as the argument, and a :class:`time` object passes ``None`` as the itself as the argument, and a :class:`time` object passes ``None`` as the
@ -1483,10 +1482,10 @@ other fixed-offset :class:`tzinfo` subclass (such as a class representing only
EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)). EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)).
.. _strftime-behavior: .. _strftime-strptime-behavior:
:meth:`strftime` Behavior :meth:`strftime` and :meth:`strptime` Behavior
------------------------- ----------------------------------------------
:class:`date`, :class:`datetime`, and :class:`time` objects all support a :class:`date`, :class:`datetime`, and :class:`time` objects all support a
``strftime(format)`` method, to create a string representing the time under the ``strftime(format)`` method, to create a string representing the time under the
@ -1494,9 +1493,14 @@ control of an explicit format string. Broadly speaking, ``d.strftime(fmt)``
acts like the :mod:`time` module's ``time.strftime(fmt, d.timetuple())`` acts like the :mod:`time` module's ``time.strftime(fmt, d.timetuple())``
although not all objects support a :meth:`timetuple` method. although not all objects support a :meth:`timetuple` method.
Conversely, the :meth:`datetime.strptime` class method creates a
:class:`datetime` object from a string representing a date and time and a
corresponding format string. ``datetime.strptime(date_string, format)`` is
equivalent to ``datetime(*(time.strptime(date_string, format)[0:6]))``.
For :class:`time` objects, the format codes for year, month, and day should not For :class:`time` objects, the format codes for year, month, and day should not
be used, as time objects have no such values. If they're used anyway, ``1900`` be used, as time objects have no such values. If they're used anyway, ``1900``
is substituted for the year, and ``0`` for the month and day. is substituted for the year, and ``1`` for the month and day.
For :class:`date` objects, the format codes for hours, minutes, seconds, and For :class:`date` objects, the format codes for hours, minutes, seconds, and
microseconds should not be used, as :class:`date` objects have no such microseconds should not be used, as :class:`date` objects have no such
@ -1623,14 +1627,14 @@ platforms. Regardless of platform, years before 1900 cannot be used.
Notes: Notes:
(1) (1)
When used with the :func:`strptime` function, the ``%f`` directive When used with the :meth:`strptime` method, the ``%f`` directive
accepts from one to six digits and zero pads on the right. ``%f`` is accepts from one to six digits and zero pads on the right. ``%f`` is
an extension to the set of format characters in the C standard (but an extension to the set of format characters in the C standard (but
implemented separately in datetime objects, and therefore always implemented separately in datetime objects, and therefore always
available). available).
(2) (2)
When used with the :func:`strptime` function, the ``%p`` directive only affects When used with the :meth:`strptime` method, the ``%p`` directive only affects
the output hour field if the ``%I`` directive is used to parse the hour. the output hour field if the ``%I`` directive is used to parse the hour.
(3) (3)
@ -1638,11 +1642,11 @@ Notes:
accounts for leap seconds and the (very rare) double leap seconds. accounts for leap seconds and the (very rare) double leap seconds.
The :mod:`time` module may produce and does accept leap seconds since The :mod:`time` module may produce and does accept leap seconds since
it is based on the Posix standard, but the :mod:`datetime` module it is based on the Posix standard, but the :mod:`datetime` module
does not accept leap seconds in :func:`strptime` input nor will it does not accept leap seconds in :meth:`strptime` input nor will it
produce them in :func:`strftime` output. produce them in :func:`strftime` output.
(4) (4)
When used with the :func:`strptime` function, ``%U`` and ``%W`` are only used in When used with the :meth:`strptime` method, ``%U`` and ``%W`` are only used in
calculations when the day of the week and the year are specified. calculations when the day of the week and the year are specified.
(5) (5)

2
Doc/library/inspect.rst
View file

@ -457,7 +457,7 @@ Classes and functions
.. function:: getargspec(func) .. function:: getargspec(func)
Get the names and default values of a function's arguments. A tuple of four Get the names and default values of a Python function's arguments. A tuple of four
things is returned: ``(args, varargs, varkw, defaults)``. *args* is a list of things is returned: ``(args, varargs, varkw, defaults)``. *args* is a list of
the argument names (it may contain nested lists). *varargs* and *varkw* are the the argument names (it may contain nested lists). *varargs* and *varkw* are the
names of the ``*`` and ``**`` arguments or ``None``. *defaults* is a tuple of names of the ``*`` and ``**`` arguments or ``None``. *defaults* is a tuple of

4
Doc/library/msvcrt.rst
View file

@ -153,6 +153,4 @@ Other Functions
.. function:: heapmin() .. function:: heapmin()
Force the :cfunc:`malloc` heap to clean itself up and return unused blocks to Force the :cfunc:`malloc` heap to clean itself up and return unused blocks to
the operating system. This only works on Windows NT. On failure, this raises the operating system. On failure, this raises :exc:`IOError`.
:exc:`IOError`.

2
Doc/library/select.rst
View file

@ -50,7 +50,7 @@ The module defines the following:
.. versionadded:: 2.6 .. versionadded:: 2.6
.. function:: kevent(ident, filter=KQ_FILTER_READ, flags=KQ_ADD, fflags=0, data=0, udata=0) .. function:: kevent(ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=0)
(Only supported on BSD.) Returns a kernel event object object; see section (Only supported on BSD.) Returns a kernel event object object; see section
:ref:`kevent-objects` below for the methods supported by kqueue objects. :ref:`kevent-objects` below for the methods supported by kqueue objects.

2
Doc/library/zipimport.rst
View file

@ -33,6 +33,8 @@ Using the built-in :func:`reload` function will fail if called on a module
loaded from a ZIP archive; it is unlikely that :func:`reload` would be needed, loaded from a ZIP archive; it is unlikely that :func:`reload` would be needed,
since this would imply that the ZIP has been altered during runtime. since this would imply that the ZIP has been altered during runtime.
ZIP archives with an archive comment are currently not supported.
.. seealso:: .. seealso::
`PKZIP Application Note <http://www.pkware.com/documents/casestudies/APPNOTE.TXT>`_ `PKZIP Application Note <http://www.pkware.com/documents/casestudies/APPNOTE.TXT>`_

13
Doc/using/windows.rst
View file

@ -168,12 +168,13 @@ separated by semicolons, though, to distinguish them from drive identifiers
.. `` .. ``
Modifying the module search path can also be done through the Windows registry: Modifying the module search path can also be done through the Windows registry
Edit under the key :file:`HKLM\\SOFTWARE\\Python\\PythonCore\\{version}\\PythonPath`.
:file:`HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\{version}\\PythonPath\\`, Subkeys which have semicolon-delimited path strings as their default value will
as described above for the environment variable :envvar:`%PYTHONPATH%`. A cause each path to be searched. Multiple subkeys can be created and are
convenient registry editor is :program:`regedit` (start it by typing "regedit" appended to the path in alphabetical order. A convenient registry editor is
into :menuselection:`Start --> Run`). :program:`regedit` (start it by typing "regedit" into :menuselection:`Start -->
Run`).
Executing scripts Executing scripts

3
Lib/email/generator.py
View file

@ -1,5 +1,4 @@
# Copyright (C) 2001-2006 Python Software Foundation # Copyright (C) 2001-2010 Python Software Foundation
# Author: Barry Warsaw
# Contact: email-sig@python.org # Contact: email-sig@python.org
"""Classes to generate plain text from a message object tree.""" """Classes to generate plain text from a message object tree."""

2
Lib/email/test/test_email.py
View file

@ -1,4 +1,4 @@
# Copyright (C) 2001-2007 Python Software Foundation # Copyright (C) 2001-2010 Python Software Foundation
# Contact: email-sig@python.org # Contact: email-sig@python.org
# email package unit tests # email package unit tests

2
Lib/email/utils.py
View file

@ -1,4 +1,4 @@
# Copyright (C) 2001-2009 Python Software Foundation # Copyright (C) 2001-2010 Python Software Foundation
# Author: Barry Warsaw # Author: Barry Warsaw
# Contact: email-sig@python.org # Contact: email-sig@python.org

2
Lib/imaplib.py
View file

@ -1212,7 +1212,7 @@ class IMAP4_stream(IMAP4):
Instantiate with: IMAP4_stream(command) Instantiate with: IMAP4_stream(command)
where "command" is a string that can be passed to Subprocess.Popen() where "command" is a string that can be passed to subprocess.Popen()
for more documentation see the docstring of the parent class IMAP4. for more documentation see the docstring of the parent class IMAP4.
""" """

2
Lib/lib-tk/turtle.py
View file

@ -2,7 +2,7 @@
# turtle.py: a Tkinter based turtle graphics module for Python # turtle.py: a Tkinter based turtle graphics module for Python
# Version 1.0.1 - 24. 9. 2009 # Version 1.0.1 - 24. 9. 2009
# #
# Copyright (C) 2006 - 2009 Gregor Lingl # Copyright (C) 2006 - 2010 Gregor Lingl
# email: glingl@aon.at # email: glingl@aon.at
# #
# This software is provided 'as-is', without any express or implied # This software is provided 'as-is', without any express or implied

2
Lib/logging/__init__.py
View file

@ -18,7 +18,7 @@
Logging package for Python. Based on PEP 282 and comments thereto in Logging package for Python. Based on PEP 282 and comments thereto in
comp.lang.python, and influenced by Apache's log4j system. comp.lang.python, and influenced by Apache's log4j system.
Copyright (C) 2001-2009 Vinay Sajip. All Rights Reserved. Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
To use, simply 'import logging' and log away! To use, simply 'import logging' and log away!
""" """

2
Lib/platform.py
View file

@ -91,7 +91,7 @@
__copyright__ = """ __copyright__ = """
Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:mal@lemburg.com Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:mal@lemburg.com
Copyright (c) 2000-2008, eGenix.com Software GmbH; mailto:info@egenix.com Copyright (c) 2000-2010, eGenix.com Software GmbH; mailto:info@egenix.com
Permission to use, copy, modify, and distribute this software and its Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee or royalty is hereby granted, documentation for any purpose and without fee or royalty is hereby granted,

6
Lib/test/test_cmd.py
View file

@ -143,7 +143,7 @@ class samplecmdclass(cmd.Cmd):
print "complete command" print "complete command"
return return
def do_shell(self): def do_shell(self, s):
pass pass
def do_add(self, s): def do_add(self, s):
@ -169,8 +169,8 @@ def test_main(verbose=None):
from test import test_support, test_cmd from test import test_support, test_cmd
test_support.run_doctest(test_cmd, verbose) test_support.run_doctest(test_cmd, verbose)
import trace, sys
def test_coverage(coverdir): def test_coverage(coverdir):
import trace
tracer=trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,], tracer=trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,],
trace=0, count=1) trace=0, count=1)
tracer.run('reload(cmd);test_main()') tracer.run('reload(cmd);test_main()')
@ -181,5 +181,7 @@ def test_coverage(coverdir):
if __name__ == "__main__": if __name__ == "__main__":
if "-c" in sys.argv: if "-c" in sys.argv:
test_coverage('/tmp/cmd.cover') test_coverage('/tmp/cmd.cover')
elif "-i" in sys.argv:
samplecmdclass().cmdloop()
else: else:
test_main() test_main()

2
Lib/test/test_hashlib.py
View file

@ -2,7 +2,7 @@
# #
# $Id$ # $Id$
# #
# Copyright (C) 2005 Gregory P. Smith (greg@krypto.org) # Copyright (C) 2005-2010 Gregory P. Smith (greg@krypto.org)
# Licensed to PSF under a Contributor Agreement. # Licensed to PSF under a Contributor Agreement.
# #

4
Lib/test/test_logging.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
# Copyright 2001-2004 by Vinay Sajip. All Rights Reserved. # Copyright 2001-2010 by Vinay Sajip. All Rights Reserved.
# #
# Permission to use, copy, modify, and distribute this software and its # Permission to use, copy, modify, and distribute this software and its
# documentation for any purpose and without fee is hereby granted, # documentation for any purpose and without fee is hereby granted,
@ -18,7 +18,7 @@
"""Test harness for the logging module. Run all tests. """Test harness for the logging module. Run all tests.
Copyright (C) 2001-2002 Vinay Sajip. All Rights Reserved. Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
""" """
import logging import logging

4
Mac/Resources/app/Info.plist.in
View file

@ -20,7 +20,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Python</string> <string>Python</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>%version%, (c) 2004-2009 Python Software Foundation.</string> <string>%version%, (c) 2004-2010 Python Software Foundation.</string>
<key>CFBundleHelpBookFolder</key> <key>CFBundleHelpBookFolder</key>
<array> <array>
<string>Documentation</string> <string>Documentation</string>
@ -37,7 +37,7 @@
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>%version%, (c) 2004-2009 Python Software Foundation.</string> <string>%version%, (c) 2004-2010 Python Software Foundation.</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Python</string> <string>Python</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>

26
Misc/developers.txt
View file

@ -17,7 +17,31 @@ the format to accommodate documentation needs as they arise.
Permissions History Permissions History
------------------- -------------------
- Tarek Ziadé as given SVN access on Decmeber 21 2008 by NCN, - Stefan Krah was given SVN access on January 5 2010 by GFB, at
suggestion of Mark Dickinson, for work on the decimal module.
- Doug Hellmann was given SVN access on September 19 2009 by GFB, at
suggestion of Jesse Noller, for documentation work.
- Ezio Melotti was given SVN access on June 7 2009 by GFB, for work on and
fixes to the documentation.
- Paul Kippes was given commit privileges at PyCon 2009 by BAC to work on 3to2.
- Ron DuPlain was given commit privileges at PyCon 2009 by BAC to work on 3to2.
- Several developers of alternative Python implementations where
given access for test suite and library adaptions by MvL:
Allison Randal (Parrot), Michael Foord (IronPython),
Jim Baker, Philip Jenvey, and Frank Wierzbicki (all Jython).
- R. David Murray was given SVN access on March 30 2009 by MvL, after
recommendation by BAC.
- Chris Withers was given SVN access on March 8 2009 by MvL,
after recommendation by GvR.
- Tarek Ziadé was given SVN access on December 21 2008 by NCN,
for maintenance of distutils. for maintenance of distutils.
- Hirokazu Yamamoto was given SVN access on August 12 2008 by MvL, - Hirokazu Yamamoto was given SVN access on August 12 2008 by MvL,

2
Modules/_hashopenssl.c
View file

@ -1,7 +1,7 @@
/* Module that wraps all OpenSSL hash algorithms */ /* Module that wraps all OpenSSL hash algorithms */
/* /*
* Copyright (C) 2005 Gregory P. Smith (greg@krypto.org) * Copyright (C) 2005-2010 Gregory P. Smith (greg@krypto.org)
* Licensed to PSF under a Contributor Agreement. * Licensed to PSF under a Contributor Agreement.
* *
* Derived from a skeleton of shamodule.c containing work performed by: * Derived from a skeleton of shamodule.c containing work performed by:

2
Modules/selectmodule.c
View file

@ -1161,7 +1161,7 @@ static PyTypeObject pyEpoll_Type = {
#endif #endif
PyDoc_STRVAR(kqueue_event_doc, PyDoc_STRVAR(kqueue_event_doc,
"kevent(ident, filter=KQ_FILTER_READ, flags=KQ_ADD, fflags=0, data=0, udata=0)\n\ "kevent(ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=0)\n\
\n\ \n\
This object is the equivalent of the struct kevent for the C API.\n\ This object is the equivalent of the struct kevent for the C API.\n\
\n\ \n\