diff options
| author | Georg Brandl <georg@python.org> | 2009-01-03 22:33:39 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-01-03 22:33:39 (GMT) |
| commit | b1441c7e47e2940c0b7372b179ab16105e4e6b77 (patch) | |
| tree | bde0a03e469ad836b7936295fe81696ad8baa7e9 /Doc | |
| parent | 4baac0f913e41f74ed14a068cb46809e6bb9ab5e (diff) | |
| download | cpython-b1441c7e47e2940c0b7372b179ab16105e4e6b77.zip cpython-b1441c7e47e2940c0b7372b179ab16105e4e6b77.tar.gz cpython-b1441c7e47e2940c0b7372b179ab16105e4e6b77.tar.bz2 | |
Merged revisions 68112,68115,68120,68133,68141-68142,68145-68146,68148-68149 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line
#4795 inspect.isgeneratorfunction() should return False instead of None
........
r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line
simplfy code
........
r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines
#4228: Pack negative values the same way as 2.4
in struct's L format.
........
r68133 | antoine.pitrou | 2009-01-01 16:38:03 +0100 (Thu, 01 Jan 2009) | 1 line
fill in actual issue number in tests
........
r68141 | benjamin.peterson | 2009-01-01 17:43:12 +0100 (Thu, 01 Jan 2009) | 1 line
fix highlighting
........
r68142 | benjamin.peterson | 2009-01-01 18:29:49 +0100 (Thu, 01 Jan 2009) | 2 lines
welcome to 2009, Python!
........
r68145 | amaury.forgeotdarc | 2009-01-02 01:03:54 +0100 (Fri, 02 Jan 2009) | 5 lines
#4801 _collections module fails to build on cygwin.
_PyObject_GC_TRACK is the macro version of PyObject_GC_Track,
and according to documentation it should not be used for extension modules.
........
r68146 | ronald.oussoren | 2009-01-02 11:44:46 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4472: "configure --enable-shared doesn't work on OSX"
........
r68148 | ronald.oussoren | 2009-01-02 11:48:31 +0100 (Fri, 02 Jan 2009) | 2 lines
Forgot to add a NEWS item in my previous checkin
........
r68149 | ronald.oussoren | 2009-01-02 11:50:48 +0100 (Fri, 02 Jan 2009) | 2 lines
Fix for issue4780
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/itertools.rst | 8 | ||||
| -rw-r--r-- | Doc/license.rst | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst index 96515111..b384cc8 100644 --- a/Doc/library/itertools.rst +++ b/Doc/library/itertools.rst @@ -466,7 +466,7 @@ can be combined. .. doctest:: - # Show a dictionary sorted and grouped by value + >>> # Show a dictionary sorted and grouped by value >>> from operator import itemgetter >>> d = dict(a=1, b=2, c=1, d=2, e=1, f=2, g=3) >>> di = sorted(d.items(), key=itemgetter(1)) @@ -477,9 +477,9 @@ can be combined. 2 ['b', 'd', 'f'] 3 ['g'] - # Find runs of consecutive numbers using groupby. The key to the solution - # is differencing with a range so that consecutive numbers all appear in - # same group. + >>> # Find runs of consecutive numbers using groupby. The key to the solution + >>> # is differencing with a range so that consecutive numbers all appear in + >>> # same group. >>> data = [ 1, 4,5,6, 10, 15,16,17,18, 22, 25,26,27,28] >>> for k, g in groupby(enumerate(data), lambda t:t[0]-t[1]): ... print(map(operator.itemgetter(1), g)) diff --git a/Doc/license.rst b/Doc/license.rst index ac29d16..faceab6 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -124,7 +124,7 @@ Terms and conditions for accessing or otherwise using Python analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python |release| alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of - copyright, i.e., "Copyright © 2001-2008 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2009 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. |