From b6453a902edc6e23093f96978ed175fa65b77fa1 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 21 Mar 2010 19:16:28 +0000 Subject: [PATCH] Merged revisions 77120,77151,77155,77209,77229,77256,77317,77331,77333,77359-77360,77382,77561,77570 via svnmerge from 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. ........ --- Doc/c-api/init.rst | 17 +++---- Doc/library/datetime.rst | 82 +++++++++++++++++---------------- Doc/library/inspect.rst | 2 +- Doc/library/msvcrt.rst | 4 +- Doc/library/select.rst | 2 +- Doc/library/zipimport.rst | 2 + Doc/using/windows.rst | 13 +++--- Lib/email/generator.py | 3 +- Lib/email/test/test_email.py | 2 +- Lib/email/utils.py | 2 +- Lib/imaplib.py | 2 +- Lib/lib-tk/turtle.py | 2 +- Lib/logging/__init__.py | 2 +- Lib/platform.py | 2 +- Lib/test/test_cmd.py | 6 ++- Lib/test/test_hashlib.py | 2 +- Lib/test/test_logging.py | 4 +- Mac/Resources/app/Info.plist.in | 4 +- Misc/developers.txt | 26 ++++++++++- Modules/_hashopenssl.c | 2 +- Modules/selectmodule.c | 2 +- 21 files changed, 107 insertions(+), 76 deletions(-) diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 7d8f0d38dda..195ce8d1f95 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -257,14 +257,15 @@ Initialization, Finalization, and Threads triple: module; search; path single: path (in module sys) - Return the default module search path; this is computed from the program name - (set by :cfunc:`Py_SetProgramName` above) and some environment variables. The - returned string consists of a series of directory names separated by a platform - dependent delimiter character. The delimiter character is ``':'`` on Unix and - Mac OS X, ``';'`` on Windows. The returned string points into static storage; - the caller should not modify its value. The value is available to Python code - as the list ``sys.path``, which may be modified to change the future search path - for loaded modules. + Return the default module search path; this is computed from the program name + (set by :cfunc:`Py_SetProgramName` above) and some environment variables. + The returned string consists of a series of directory names separated by a + platform dependent delimiter character. The delimiter character is ``':'`` + on Unix and Mac OS X, ``';'`` on Windows. The returned string points into + static storage; the caller should not modify its value. The list + :data:`sys.path` is initialized with this value on interpreter startup; it + can be (and usually is) modified later to change the search path for loading + modules. .. XXX should give the exact rules diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index 021f88b05a3..aeb0d58d3bf 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -38,7 +38,6 @@ than rational, and there is no standard suitable for every application. The :mod:`datetime` module exports the following constants: - .. data:: MINYEAR 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 --------------- - .. class:: date :noindex: @@ -133,7 +131,6 @@ Subclass relationships:: A :class:`timedelta` object represents a duration, the difference between two dates or times. - .. class:: timedelta([days[, seconds[, microseconds[, milliseconds[, minutes[, hours[, weeks]]]]]]]) 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) (-1, 86399, 999999) -Class attributes are: +Class attributes are: .. attribute:: timedelta.min @@ -316,16 +313,16 @@ systems. If an argument outside those ranges is given, :exc:`ValueError` is raised. + Other constructors, all class methods: - -.. method:: date.today() +.. classmethod:: date.today() Return the current local date. This is equivalent to ``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 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`. -.. method:: date.fromordinal(ordinal) +.. classmethod:: date.fromordinal(ordinal) 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 <= date.max.toordinal()``. For any date *d*, ``date.fromordinal(d.toordinal()) == d``. -Class attributes: +Class attributes: .. attribute:: date.min @@ -360,8 +357,8 @@ Class attributes: The smallest possible difference between non-equal date objects, ``timedelta(days=1)``. -Instance attributes (read-only): +Instance attributes (read-only): .. 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. + Supported operations: +-------------------------------+----------------------------------------------+ @@ -429,7 +427,6 @@ objects are considered to be true. Instance methods: - .. method:: date.replace(year, month, day) 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. 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:: @@ -576,7 +574,6 @@ both directions; like a time object, :class:`datetime` assumes there are exactly Constructor: - .. class:: datetime(year, month, day[, hour[, minute[, second[, microsecond[, tzinfo]]]]]) The year, month and day arguments are required. *tzinfo* may be ``None``, or an @@ -595,15 +592,14 @@ Constructor: Other constructors, all class methods: - -.. method:: datetime.today() +.. classmethod:: datetime.today() Return the current local datetime, with :attr:`tzinfo` ``None``. This is equivalent to ``datetime.fromtimestamp(time.time())``. See also :meth:`now`, :meth:`fromtimestamp`. -.. method:: datetime.now([tz]) +.. classmethod:: datetime.now([tz]) 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 @@ -617,14 +613,14 @@ Other constructors, all class methods: 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 :meth:`now`, but returns the current UTC date and time, as a naive :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 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`. -.. method:: datetime.utcfromtimestamp(timestamp) +.. classmethod:: datetime.utcfromtimestamp(timestamp) Return the UTC :class:`datetime` corresponding to the POSIX timestamp, with :attr:`tzinfo` ``None``. This may raise :exc:`ValueError`, if the timestamp is @@ -654,7 +650,7 @@ Other constructors, all class methods: :meth:`fromtimestamp`. -.. method:: datetime.fromordinal(ordinal) +.. classmethod:: datetime.fromordinal(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 @@ -662,7 +658,7 @@ Other constructors, all class methods: 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 :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. -.. method:: datetime.strptime(date_string, format) +.. classmethod:: datetime.strptime(date_string, format) Return a :class:`datetime` corresponding to *date_string*, parsed according to *format*. This is equivalent to ``datetime(*(time.strptime(date_string, 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 - time tuple. + time tuple. See section :ref:`strftime-strptime-behavior`. .. versionadded:: 2.5 -Class attributes: +Class attributes: .. attribute:: datetime.min @@ -701,8 +697,8 @@ Class attributes: The smallest possible difference between non-equal :class:`datetime` objects, ``timedelta(microseconds=1)``. -Instance attributes (read-only): +Instance attributes (read-only): .. attribute:: datetime.year @@ -744,6 +740,7 @@ Instance attributes (read-only): The object passed as the *tzinfo* argument to the :class:`datetime` constructor, or ``None`` if none was passed. + Supported operations: +---------------------------------------+-------------------------------+ @@ -817,7 +814,6 @@ all :class:`datetime` objects are considered to be true. Instance methods: - .. method:: datetime.date() Return :class:`date` object with same year, month and day. @@ -995,7 +991,8 @@ Instance methods: .. method:: datetime.strftime(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: @@ -1108,7 +1105,6 @@ Using datetime with tzinfo: A time object represents a (local) time of day, independent of any particular day, and subject to adjustment via a :class:`tzinfo` object. - .. class:: time(hour[, minute[, second[, microsecond[, tzinfo]]]]) 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` objects is not supported. -Instance attributes (read-only): +Instance attributes (read-only): .. attribute:: time.hour @@ -1170,6 +1166,7 @@ Instance attributes (read-only): The object passed as the tzinfo argument to the :class:`time` constructor, or ``None`` if none was passed. + Supported operations: * 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 ``0`` if that's ``None``), the result is non-zero. -Instance methods: +Instance methods: .. method:: time.replace([hour[, minute[, second[, microsecond[, tzinfo]]]]]) @@ -1219,7 +1216,7 @@ Instance methods: .. method:: time.strftime(format) 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() @@ -1244,6 +1241,7 @@ Instance methods: ``self.tzinfo.tzname(None)``, or raises an exception if the latter doesn't return ``None`` or a string object. + Example: >>> 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`. + 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 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)). -.. _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 ``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())`` 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 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 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: (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 an extension to the set of format characters in the C standard (but implemented separately in datetime objects, and therefore always available). (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. (3) @@ -1638,11 +1642,11 @@ Notes: accounts for leap seconds and the (very rare) double leap seconds. The :mod:`time` module may produce and does accept leap seconds since 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. (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. (5) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index 39f1f3e6333..29dc6ae9149 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -457,7 +457,7 @@ Classes and functions .. 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 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 diff --git a/Doc/library/msvcrt.rst b/Doc/library/msvcrt.rst index 4537be89997..4fc553f5f73 100644 --- a/Doc/library/msvcrt.rst +++ b/Doc/library/msvcrt.rst @@ -153,6 +153,4 @@ Other Functions .. function:: heapmin() 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 - :exc:`IOError`. - + the operating system. On failure, this raises :exc:`IOError`. diff --git a/Doc/library/select.rst b/Doc/library/select.rst index 0e6e4af78dc..b599d972d46 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -50,7 +50,7 @@ The module defines the following: .. 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 :ref:`kevent-objects` below for the methods supported by kqueue objects. diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst index 1cad24c905c..8e6b132cf45 100644 --- a/Doc/library/zipimport.rst +++ b/Doc/library/zipimport.rst @@ -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, since this would imply that the ZIP has been altered during runtime. +ZIP archives with an archive comment are currently not supported. + .. seealso:: `PKZIP Application Note `_ diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index f5235f19be5..52349d78b4f 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -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: -Edit -:file:`HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\{version}\\PythonPath\\`, -as described above for the environment variable :envvar:`%PYTHONPATH%`. A -convenient registry editor is :program:`regedit` (start it by typing "regedit" -into :menuselection:`Start --> Run`). +Modifying the module search path can also be done through the Windows registry +under the key :file:`HKLM\\SOFTWARE\\Python\\PythonCore\\{version}\\PythonPath`. +Subkeys which have semicolon-delimited path strings as their default value will +cause each path to be searched. Multiple subkeys can be created and are +appended to the path in alphabetical order. A convenient registry editor is +:program:`regedit` (start it by typing "regedit" into :menuselection:`Start --> +Run`). Executing scripts diff --git a/Lib/email/generator.py b/Lib/email/generator.py index 94320a2579b..560ce9a3ad3 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -1,5 +1,4 @@ -# Copyright (C) 2001-2006 Python Software Foundation -# Author: Barry Warsaw +# Copyright (C) 2001-2010 Python Software Foundation # Contact: email-sig@python.org """Classes to generate plain text from a message object tree.""" diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index a0519519ea4..d66519e31bd 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2007 Python Software Foundation +# Copyright (C) 2001-2010 Python Software Foundation # Contact: email-sig@python.org # email package unit tests diff --git a/Lib/email/utils.py b/Lib/email/utils.py index 87979dc8734..b9a7642fb30 100644 --- a/Lib/email/utils.py +++ b/Lib/email/utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2009 Python Software Foundation +# Copyright (C) 2001-2010 Python Software Foundation # Author: Barry Warsaw # Contact: email-sig@python.org diff --git a/Lib/imaplib.py b/Lib/imaplib.py index 78ae45ef520..d1f62b09345 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -1212,7 +1212,7 @@ class IMAP4_stream(IMAP4): 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. """ diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py index 625b31bce7c..06e0b882963 100644 --- a/Lib/lib-tk/turtle.py +++ b/Lib/lib-tk/turtle.py @@ -2,7 +2,7 @@ # turtle.py: a Tkinter based turtle graphics module for Python # Version 1.0.1 - 24. 9. 2009 # -# Copyright (C) 2006 - 2009 Gregor Lingl +# Copyright (C) 2006 - 2010 Gregor Lingl # email: glingl@aon.at # # This software is provided 'as-is', without any express or implied diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 03c67b02047..6791259f8e6 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -18,7 +18,7 @@ Logging package for Python. Based on PEP 282 and comments thereto in 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! """ diff --git a/Lib/platform.py b/Lib/platform.py index ea440d13491..aa5fd76330c 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -91,7 +91,7 @@ __copyright__ = """ 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 documentation for any purpose and without fee or royalty is hereby granted, diff --git a/Lib/test/test_cmd.py b/Lib/test/test_cmd.py index c08df0ba23c..8898a32cb91 100644 --- a/Lib/test/test_cmd.py +++ b/Lib/test/test_cmd.py @@ -143,7 +143,7 @@ class samplecmdclass(cmd.Cmd): print "complete command" return - def do_shell(self): + def do_shell(self, s): pass def do_add(self, s): @@ -169,8 +169,8 @@ def test_main(verbose=None): from test import test_support, test_cmd test_support.run_doctest(test_cmd, verbose) -import trace, sys def test_coverage(coverdir): + import trace tracer=trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,], trace=0, count=1) tracer.run('reload(cmd);test_main()') @@ -181,5 +181,7 @@ def test_coverage(coverdir): if __name__ == "__main__": if "-c" in sys.argv: test_coverage('/tmp/cmd.cover') + elif "-i" in sys.argv: + samplecmdclass().cmdloop() else: test_main() diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index b543fd0a9b2..52c50f534ba 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -2,7 +2,7 @@ # # $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. # diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 7861106cb49..9af28181163 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -1,6 +1,6 @@ #!/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 # documentation for any purpose and without fee is hereby granted, @@ -18,7 +18,7 @@ """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 diff --git a/Mac/Resources/app/Info.plist.in b/Mac/Resources/app/Info.plist.in index bd4a54c290c..83d1b26a014 100644 --- a/Mac/Resources/app/Info.plist.in +++ b/Mac/Resources/app/Info.plist.in @@ -20,7 +20,7 @@ CFBundleExecutable Python CFBundleGetInfoString - %version%, (c) 2004-2009 Python Software Foundation. + %version%, (c) 2004-2010 Python Software Foundation. CFBundleHelpBookFolder Documentation @@ -37,7 +37,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - %version%, (c) 2004-2009 Python Software Foundation. + %version%, (c) 2004-2010 Python Software Foundation. CFBundleName Python CFBundlePackageType diff --git a/Misc/developers.txt b/Misc/developers.txt index 5b90e4c277c..ac366dc5965 100644 --- a/Misc/developers.txt +++ b/Misc/developers.txt @@ -17,7 +17,31 @@ the format to accommodate documentation needs as they arise. 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. - Hirokazu Yamamoto was given SVN access on August 12 2008 by MvL, diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 497088df1ec..691d1e89298 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -1,7 +1,7 @@ /* 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. * * Derived from a skeleton of shamodule.c containing work performed by: diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index a254233323d..2a3eefd5bdf 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -1161,7 +1161,7 @@ static PyTypeObject pyEpoll_Type = { #endif 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\ This object is the equivalent of the struct kevent for the C API.\n\ \n\