[Python-checkins] r85247 - in python/branches/release31-maint: Doc/howto/descriptor.rst Doc/howto/index.rst Doc/library/datetime.rst Doc/library/multiprocessing.rst Doc/library/urllib.request.rst Doc/reference/lexical_analysis.rst

Wed Oct 6 10:03:21 CEST 2010

Author: georg.brandl
Date: Wed Oct 6 10:03:21 2010
New Revision: 85247
Log:
Merged revisions 79901,80170,80273,80342-80343,81061,81366,81368,81370,81840 via svnmerge from 
svn+ssh://svn.python.org/python/branches/py3k
................
 r79901 | georg.brandl | 2010年04月08日 08:33:16 +0200 (Do, 08 Apr 2010) | 1 line
 
 Fix indentation.
................
 r80170 | georg.brandl | 2010年04月18日 11:50:07 +0200 (So, 18 Apr 2010) | 1 line
 
 Remove colspanning cells.
................
 r80273 | georg.brandl | 2010年04月20日 20:15:54 +0200 (Di, 20 Apr 2010) | 1 line
 
 Markup nit.
................
 r80342 | georg.brandl | 2010年04月22日 09:00:42 +0200 (Do, 22 Apr 2010) | 1 line
 
 Fix indentation.
................
 r80343 | georg.brandl | 2010年04月22日 09:02:51 +0200 (Do, 22 Apr 2010) | 1 line
 
 Typo fixes.
................
 r81061 | georg.brandl | 2010年05月10日 23:17:00 +0200 (Mo, 10 Mai 2010) | 1 line
 
 Fix nits in the lexical analysis section: \u requires four digits, backtick is not allowed in source in 3.x.
................
 r81366 | georg.brandl | 2010年05月19日 22:58:02 +0200 (Mi, 19 Mai 2010) | 61 lines
 
 Recorded merge of revisions 80030,80067,80069,80080-80081,80084,80432-80433,80465,80470,81059,81065-81067 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r80030 | georg.brandl | 2010年04月13日 08:43:54 +0200 (Di, 13 Apr 2010) | 1 line
 
 Get rid of multi-row cells.
 ........
 r80067 | georg.brandl | 2010年04月14日 10:53:38 +0200 (Mi, 14 Apr 2010) | 1 line
 
 #5341: typo.
 ........
 r80069 | georg.brandl | 2010年04月14日 15:50:31 +0200 (Mi, 14 Apr 2010) | 1 line
 
 Add an x-ref to where the O_ constants are documented and move the SEEK_ constants after lseek().
 ........
 r80080 | georg.brandl | 2010年04月14日 21:16:38 +0200 (Mi, 14 Apr 2010) | 1 line
 
 #8399: add note about Windows and O_BINARY.
 ........
 r80081 | georg.brandl | 2010年04月14日 23:34:44 +0200 (Mi, 14 Apr 2010) | 1 line
 
 #5250: document __instancecheck__ and __subclasscheck__. I hope the part about the class/metaclass distinction is understandable.
 ........
 r80084 | georg.brandl | 2010年04月14日 23:46:45 +0200 (Mi, 14 Apr 2010) | 1 line
 
 Fix missing.
 ........
 r80432 | georg.brandl | 2010年04月24日 10:56:58 +0200 (Sa, 24 Apr 2010) | 1 line
 
 Markup fixes.
 ........
 r80433 | georg.brandl | 2010年04月24日 11:08:10 +0200 (Sa, 24 Apr 2010) | 1 line
 
 #7507: quote "!" in pipes.quote(); it is a special character for some shells.
 ........
 r80465 | georg.brandl | 2010年04月25日 12:29:17 +0200 (So, 25 Apr 2010) | 1 line
 
 Remove LaTeXy index entry syntax.
 ........
 r80470 | georg.brandl | 2010年04月25日 12:57:15 +0200 (So, 25 Apr 2010) | 1 line
 
 Patch from Tim Hatch: Make socket setblocking <-> settimeout examples symmetric.
 ........
 r81059 | georg.brandl | 2010年05月10日 23:02:51 +0200 (Mo, 10 Mai 2010) | 1 line
 
 #8642: fix wrong function name.
 ........
 r81065 | georg.brandl | 2010年05月10日 23:46:50 +0200 (Mo, 10 Mai 2010) | 1 line
 
 Fix reference direction.
 ........
 r81066 | georg.brandl | 2010年05月10日 23:50:57 +0200 (Mo, 10 Mai 2010) | 1 line
 
 Consolidate deprecation messages.
 ........
 r81067 | georg.brandl | 2010年05月10日 23:51:33 +0200 (Mo, 10 Mai 2010) | 1 line
 
 Fix typo.
 ........
................
 r81368 | georg.brandl | 2010年05月19日 23:06:36 +0200 (Mi, 19 Mai 2010) | 9 lines
 
 Merged revisions 80068 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r80068 | georg.brandl | 2010年04月14日 10:56:01 +0200 (Mi, 14 Apr 2010) | 1 line
 
 #5341: fix typo and adapt docstring syntax.
 ........
................
 r81370 | georg.brandl | 2010年05月19日 23:39:51 +0200 (Mi, 19 Mai 2010) | 1 line
 
 Add descriptor HOWTO to py3k docs.
................
 r81840 | alexander.belopolsky | 2010年06月08日 20:59:20 +0200 (Di, 08 Jun 2010) | 9 lines
 
 Merged revisions 81489 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r81489 | georg.brandl | 2010年05月23日 17:29:29 -0400 (2010年5月23日) | 1 line
 
 #1436346: make it more obvious that timetuple[7] is yday.
 ........
................
Added:
 python/branches/release31-maint/Doc/howto/descriptor.rst
 - copied unchanged from r81370, /python/branches/py3k/Doc/howto/descriptor.rst
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Doc/howto/index.rst
 python/branches/release31-maint/Doc/library/datetime.rst
 python/branches/release31-maint/Doc/library/multiprocessing.rst
 python/branches/release31-maint/Doc/library/urllib.request.rst
 python/branches/release31-maint/Doc/reference/lexical_analysis.rst
Modified: python/branches/release31-maint/Doc/howto/index.rst
==============================================================================

--- python/branches/release31-maint/Doc/howto/index.rst	(original)
+++ python/branches/release31-maint/Doc/howto/index.rst	Wed Oct 6 10:03:21 2010
@@ -16,6 +16,7 @@
 advocacy.rst
 cporting.rst
 curses.rst
+ descriptor.rst
 doanddont.rst
 functional.rst
 regex.rst
Modified: python/branches/release31-maint/Doc/library/datetime.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/datetime.rst	(original)
+++ python/branches/release31-maint/Doc/library/datetime.rst	Wed Oct 6 10:03:21 2010
@@ -455,7 +455,9 @@
 Return a :class:`time.struct_time` such as returned by :func:`time.localtime`.
 The hours, minutes and seconds are 0, and the DST flag is -1. ``d.timetuple()``
 is equivalent to ``time.struct_time((d.year, d.month, d.day, 0, 0, 0,
- d.weekday(), d.toordinal() - date(d.year, 1, 1).toordinal() + 1, -1))``
+ d.weekday(), yday, -1))``, where ``yday = d.toordinal() - date(d.year, 1,
+ 1).toordinal() + 1`` is the day number within the current year starting with
+ ``1`` for January 1st.
 
 
 .. method:: date.toordinal()
@@ -919,12 +921,13 @@
 
 Return a :class:`time.struct_time` such as returned by :func:`time.localtime`.
 ``d.timetuple()`` is equivalent to ``time.struct_time((d.year, d.month, d.day,
- d.hour, d.minute, d.second, d.weekday(), d.toordinal() - date(d.year, 1,
- 1).toordinal() + 1, dst))`` The :attr:`tm_isdst` flag of the result is set
- according to the :meth:`dst` method: :attr:`tzinfo` is ``None`` or :meth:`dst`
- returns ``None``, :attr:`tm_isdst` is set to ``-1``; else if :meth:`dst`
- returns a non-zero value, :attr:`tm_isdst` is set to ``1``; else ``tm_isdst`` is
- set to ``0``.
+ d.hour, d.minute, d.second, d.weekday(), yday, dst))``, where ``yday =
+ d.toordinal() - date(d.year, 1, 1).toordinal() + 1`` is the day number within
+ the current year starting with ``1`` for January 1st. The :attr:`tm_isdst` flag
+ of the result is set according to the :meth:`dst` method: :attr:`tzinfo` is
+ ``None`` or :meth:`dst`` returns ``None``, :attr:`tm_isdst` is set to ``-1``;
+ else if :meth:`dst` returns a non-zero value, :attr:`tm_isdst` is set to ``1``;
+ else ``tm_isdst`` is set to ``0``.
 
 
 .. method:: datetime.utctimetuple()
Modified: python/branches/release31-maint/Doc/library/multiprocessing.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/multiprocessing.rst	(original)
+++ python/branches/release31-maint/Doc/library/multiprocessing.rst	Wed Oct 6 10:03:21 2010
@@ -61,15 +61,15 @@
 follows the API of :class:`threading.Thread`. A trivial example of a
 multiprocess program is ::
 
- from multiprocessing import Process
+ from multiprocessing import Process
 
 def f(name):
 print('hello', name)
 
- if __name__ == '__main__':
- p = Process(target=f, args=('bob',))
- p.start()
- p.join()
+ if __name__ == '__main__':
+ p = Process(target=f, args=('bob',))
+ p.start()
+ p.join()
 
 To show the individual process IDs involved, here is an expanded example::
 
Modified: python/branches/release31-maint/Doc/library/urllib.request.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/urllib.request.rst	(original)
+++ python/branches/release31-maint/Doc/library/urllib.request.rst	Wed Oct 6 10:03:21 2010
@@ -1058,7 +1058,7 @@
 --------
 
 This example gets the python.org main page and displays the first 300 bytes of
-it.::
+it. ::
 
 >>> import urllib.request
 >>> f = urllib.request.urlopen('http://www.python.org/')
Modified: python/branches/release31-maint/Doc/reference/lexical_analysis.rst
==============================================================================
--- python/branches/release31-maint/Doc/reference/lexical_analysis.rst	(original)
+++ python/branches/release31-maint/Doc/reference/lexical_analysis.rst	Wed Oct 6 10:03:21 2010
@@ -512,13 +512,13 @@
 
 (4)
 Individual code units which form parts of a surrogate pair can be encoded using
- this escape sequence. Unlike in Standard C, exactly two hex digits are required.
+ this escape sequence. Exactly four hex digits are required.
 
 (5)
 Any Unicode character can be encoded this way, but characters outside the Basic
 Multilingual Plane (BMP) will be encoded using a surrogate pair if Python is
- compiled to use 16-bit code units (the default). Individual code units which
- form parts of a surrogate pair can be encoded using this escape sequence.
+ compiled to use 16-bit code units (the default). Exactly eight hex digits
+ are required.
 
 
 .. index:: unrecognized escape sequence
@@ -700,4 +700,4 @@
 The following printing ASCII characters are not used in Python. Their
 occurrence outside string literals and comments is an unconditional error::
 
- $ ?
+ $ ? `
