[Python-checkins] cpython (merge 3.3 -> 3.3): Merge heads

Thu Jan 16 16:37:41 CET 2014

http://hg.python.org/cpython/rev/1100f9824b2f
changeset: 88504:1100f9824b2f
branch: 3.3
parent: 88503:92fd0df03823
parent: 88501:aa88c8265e94
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu Jan 16 17:20:02 2014 +0200
summary:
 Merge heads
files:
 Doc/library/itertools.rst | 32 +++++++++++++-------------
 Doc/library/sqlite3.rst | 2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -43,22 +43,22 @@
 
 **Iterators terminating on the shortest input sequence:**
 
-==================== ============================ ================================================= =============================================================
-Iterator Arguments Results Example
-==================== ============================ ================================================= =============================================================
-:func:`accumulate` p [,func] p0, p0+p1, p0+p1+p2, ... ``accumulate([1,2,3,4,5]) --> 1 3 6 10 15``
-:func:`chain` p, q, ... p0, p1, ... plast, q0, q1, ... ``chain('ABC', 'DEF') --> A B C D E F``
-chain.from_iterable iterable p0, p1, ... plast, q0, q1, ... ``chain.from_iterable(['ABC', 'DEF']) --> A B C D E F``
-:func:`compress` data, selectors (d[0] if s[0]), (d[1] if s[1]), ... ``compress('ABCDEF', [1,0,1,0,1,1]) --> A C E F``
-:func:`dropwhile` pred, seq seq[n], seq[n+1], starting when pred fails ``dropwhile(lambda x: x<5, [1,4,6,4,1]) --> 6 4 1``
-:func:`filterfalse` pred, seq elements of seq where pred(elem) is false ``filterfalse(lambda x: x%2, range(10)) --> 0 2 4 6 8``
-:func:`groupby` iterable[, keyfunc] sub-iterators grouped by value of keyfunc(v)
-:func:`islice` seq, [start,] stop [, step] elements from seq[start:stop:step] ``islice('ABCDEFG', 2, None) --> C D E F G``
-:func:`starmap` func, seq func(\*seq[0]), func(\*seq[1]), ... ``starmap(pow, [(2,5), (3,2), (10,3)]) --> 32 9 1000``
-:func:`takewhile` pred, seq seq[0], seq[1], until pred fails ``takewhile(lambda x: x<5, [1,4,6,4,1]) --> 1 4``
-:func:`tee` it, n it1, it2, ... itn splits one iterator into n
-:func:`zip_longest` p, q, ... (p[0], q[0]), (p[1], q[1]), ... ``zip_longest('ABCD', 'xy', fillvalue='-') --> Ax By C- D-``
-==================== ============================ ================================================= =============================================================
+============================ ============================ ================================================= =============================================================
+Iterator Arguments Results Example
+============================ ============================ ================================================= =============================================================
+:func:`accumulate` p [,func] p0, p0+p1, p0+p1+p2, ... ``accumulate([1,2,3,4,5]) --> 1 3 6 10 15``
+:func:`chain` p, q, ... p0, p1, ... plast, q0, q1, ... ``chain('ABC', 'DEF') --> A B C D E F``
+:func:`chain.from_iterable` iterable p0, p1, ... plast, q0, q1, ... ``chain.from_iterable(['ABC', 'DEF']) --> A B C D E F``
+:func:`compress` data, selectors (d[0] if s[0]), (d[1] if s[1]), ... ``compress('ABCDEF', [1,0,1,0,1,1]) --> A C E F``
+:func:`dropwhile` pred, seq seq[n], seq[n+1], starting when pred fails ``dropwhile(lambda x: x<5, [1,4,6,4,1]) --> 6 4 1``
+:func:`filterfalse` pred, seq elements of seq where pred(elem) is false ``filterfalse(lambda x: x%2, range(10)) --> 0 2 4 6 8``
+:func:`groupby` iterable[, keyfunc] sub-iterators grouped by value of keyfunc(v)
+:func:`islice` seq, [start,] stop [, step] elements from seq[start:stop:step] ``islice('ABCDEFG', 2, None) --> C D E F G``
+:func:`starmap` func, seq func(\*seq[0]), func(\*seq[1]), ... ``starmap(pow, [(2,5), (3,2), (10,3)]) --> 32 9 1000``
+:func:`takewhile` pred, seq seq[0], seq[1], until pred fails ``takewhile(lambda x: x<5, [1,4,6,4,1]) --> 1 4``
+:func:`tee` it, n it1, it2, ... itn splits one iterator into n
+:func:`zip_longest` p, q, ... (p[0], q[0]), (p[1], q[1]), ... ``zip_longest('ABCD', 'xy', fillvalue='-') --> Ax By C- D-``
+============================ ============================ ================================================= =============================================================
 
 **Combinatoric generators:**
 
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -91,7 +91,7 @@
 
 .. seealso::
 
- http://code.google.com/p/pysqlite/
+ https://github.com/ghaering/pysqlite
 The pysqlite web page -- sqlite3 is developed externally under the name
 "pysqlite".
 
-- 
Repository URL: http://hg.python.org/cpython
