diff options
author | Guido van Rossum <guido@python.org> | 2007-07-11 13:09:30 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 2007-07-11 13:09:30 (GMT) |
commit | 992d4a3e6e67a05b85350820157028a61d1f22cf (patch) | |
tree | de6cec6ca9ef35d3dfef01f88513df9e8d65afaa /Lib | |
parent | c6a55ee2a5739b2f98d970562d1e57013f129c50 (diff) | |
download | cpython-992d4a3e6e67a05b85350820157028a61d1f22cf.zip cpython-992d4a3e6e67a05b85350820157028a61d1f22cf.tar.gz cpython-992d4a3e6e67a05b85350820157028a61d1f22cf.tar.bz2 |
Merged revisions 56154-56264 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r56155 | neal.norwitz | 2007-07-03 08:59:08 +0300 (Tue, 03 Jul 2007) | 1 line
Get this test working after converting map to return an iterator
................
r56202 | neal.norwitz | 2007-07-09 04:30:09 +0300 (Mon, 09 Jul 2007) | 37 lines
Merged revisions 56124-56201 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines
Document smtp.SMTPAuthenticationError.
........
r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines
Fix a few webbrowser.py problems.
........
r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines
Remove duplicate sentence from alarm() doc.
........
r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines
copy built files to the PCBuild directory, where tools like
distutils or external build processes can find them.
........
r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines
Many calls to tk.call involve an arglist containing a single tuple.
Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG
don't. Tcl's concatenation of args was affected; IDLE doesn't start.
Modify Tkapp_Call() to unpack single tuple arglists.
Bug 1733943
Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html
........
r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line
Fix typo in comment
........
................
r56251 | neal.norwitz | 2007-07-11 10:01:01 +0300 (Wed, 11 Jul 2007) | 1 line
Get working with map returning an iterator (had to fix whitespace too)
................
r56255 | thomas.wouters | 2007-07-11 13:41:37 +0300 (Wed, 11 Jul 2007) | 6 lines
Clean up merge glitch or copy-paste error (the entire module was duplicated,
except the first half even had some more copy-paste errors, referring to
listcomps and genexps instead of setcomps)
................
r56256 | thomas.wouters | 2007-07-11 15:16:01 +0300 (Wed, 11 Jul 2007) | 14 lines
Dict comprehensions. Still needs doc changes (like many python-3000 features
;-). It generates bytecode similar to:
x = {}
for k, v in (generator here):
x[k] = v
except there is no tuple-packing and -unpacking involved. Trivial
measurement suggests it's significantly faster than dict(generator here) (in
the order of 2 to 3 times as fast) but I have not done extensive
measurements.
................
r56263 | guido.van.rossum | 2007-07-11 15:36:26 +0300 (Wed, 11 Jul 2007) | 3 lines
Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size
change during iter in destroy call.
................
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/bsddb/test/test_join.py | 4 | ||||
-rw-r--r-- | Lib/lib-tk/Tkinter.py | 2 | ||||
-rw-r--r-- | Lib/sre_compile.py | 2 | ||||
-rw-r--r-- | Lib/test/test_setcomps.py | 302 | ||||
-rw-r--r-- | Lib/webbrowser.py | 2 |
5 files changed, 6 insertions, 306 deletions
diff --git a/Lib/bsddb/test/test_join.py b/Lib/bsddb/test/test_join.py index 00e7479..46178b0 100644 --- a/Lib/bsddb/test/test_join.py +++ b/Lib/bsddb/test/test_join.py @@ -72,13 +72,13 @@ class JoinTestCase(unittest.TestCase): # create and populate primary index priDB = db.DB(self.env) priDB.open(self.filename, "primary", db.DB_BTREE, db.DB_CREATE) - map(lambda t, priDB=priDB: priDB.put(*t), ProductIndex) + [priDB.put(*t) for t in ProductIndex] # create and populate secondary index secDB = db.DB(self.env) secDB.set_flags(db.DB_DUP | db.DB_DUPSORT) secDB.open(self.filename, "secondary", db.DB_BTREE, db.DB_CREATE) - map(lambda t, secDB=secDB: secDB.put(*t), ColorIndex) + [secDB.put(*t) for t in ColorIndex] sCursor = None jCursor = None diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py index 1426357..1e4d771 100644 --- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -1931,7 +1931,7 @@ class BaseWidget(Misc): k.configure(self, v) def destroy(self): """Destroy this and all descendants widgets.""" - for c in self.children.values(): c.destroy() + for c in list(self.children.values()): c.destroy() self.tk.call('destroy', self._w) if self._name in self.master.children: del self.master.children[self._name] diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py index 5b66084..3c9035f 100644 --- a/Lib/sre_compile.py +++ b/Lib/sre_compile.py @@ -280,7 +280,7 @@ def _mk_bitmap(bits): # To represent a big charset, first a bitmap of all characters in the # set is constructed. Then, this bitmap is sliced into chunks of 256 -# characters, duplicate chunks are eliminitated, and each chunk is +# characters, duplicate chunks are eliminated, and each chunk is # given a number. In the compiled expression, the charset is # represented by a 16-bit word sequence, consisting of one word for # the number of different chunks, a sequence of 256 bytes (128 words) diff --git a/Lib/test/test_setcomps.py b/Lib/test/test_setcomps.py index 7b09527..f382293 100644 --- a/Lib/test/test_setcomps.py +++ b/Lib/test/test_setcomps.py @@ -134,308 +134,6 @@ __test__ = {'doctests' : doctests} def test_main(verbose=None): import sys from test import test_support - from test import test_listcomps - test_support.run_doctest(test_listcomps, verbose) - - # verify reference counting - if verbose and hasattr(sys, "gettotalrefcount"): - import gc - counts = [None] * 5 - for i in range(len(counts)): - test_support.run_doctest(test_genexps, verbose) - gc.collect() - counts[i] = sys.gettotalrefcount() - print(counts) - -if __name__ == "__main__": - test_main(verbose=True) -doctests = """ -########### Tests mostly copied from test_listcomps.py ############ - -Test simple loop with conditional - - >>> sum({i*i for i in range(100) if i&1 == 1}) - 166650 - -Test simple case - - >>> {2*y + x + 1 for x in (0,) for y in (1,)} - {3} - -Test simple nesting - - >>> list(sorted({(i,j) for i in range(3) for j in range(4)})) - [(0, 0), (0, 1), (0, 2), (0, 3), (1, 0), (1, 1), (1, 2), (1, 3), (2, 0), (2, 1), (2, 2), (2, 3)] - -Test nesting with the inner expression dependent on the outer - - >>> list(sorted({(i,j) for i in range(4) for j in range(i)})) - [(1, 0), (2, 0), (2, 1), (3, 0), (3, 1), (3, 2)] - -Make sure the induction variable is not exposed - - >>> i = 20 - >>> sum({i*i for i in range(100)}) - 328350 - - >>> i - 20 - -Verify that syntax error's are raised for setcomps used as lvalues - - >>> {y for y in (1,2)} = 10 # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - ... - SyntaxError: ... - - >>> {y for y in (1,2)} += 10 # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - ... - SyntaxError: ... - - -Make a nested set comprehension that acts like set(range()) - - >>> def srange(n): - ... return {i for i in range(n)} - >>> list(sorted(srange(10))) - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - -Same again, only as a lambda expression instead of a function definition - - >>> lrange = lambda n: {i for i in range(n)} - >>> list(sorted(lrange(10))) - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - -Generators can call other generators: - - >>> def grange(n): - ... for x in {i for i in range(n)}: - ... yield x - >>> list(sorted(grange(5))) - [0, 1, 2, 3, 4] - - -Make sure that None is a valid return value - - >>> {None for i in range(10)} - {None} - -########### Tests for various scoping corner cases ############ - -Return lambdas that use the iteration variable as a default argument - - >>> items = {(lambda i=i: i) for i in range(5)} - >>> {x() for x in items} == set(range(5)) - True - -Same again, only this time as a closure variable - - >>> items = {(lambda: i) for i in range(5)} - >>> {x() for x in items} - {4} - -Another way to test that the iteration variable is local to the list comp - - >>> items = {(lambda: i) for i in range(5)} - >>> i = 20 - >>> {x() for x in items} - {4} - -And confirm that a closure can jump over the list comp scope - - >>> items = {(lambda: y) for i in range(5)} - >>> y = 2 - >>> {x() for x in items} - {2} - -We also repeat each of the above scoping tests inside a function - - >>> def test_func(): - ... items = {(lambda i=i: i) for i in range(5)} - ... return {x() for x in items} - >>> test_func() == set(range(5)) - True - - >>> def test_func(): - ... items = {(lambda: i) for i in range(5)} - ... return {x() for x in items} - >>> test_func() - {4} - - >>> def test_func(): - ... items = {(lambda: i) for i in range(5)} - ... i = 20 - ... return {x() for x in items} - >>> test_func() - {4} - - >>> def test_func(): - ... items = {(lambda: y) for i in range(5)} - ... y = 2 - ... return {x() for x in items} - >>> test_func() - {2} - -""" - - -__test__ = {'doctests' : doctests} - -def test_main(verbose=None): - import sys - from test import test_support - from test import test_listcomps - test_support.run_doctest(test_listcomps, verbose) - - # verify reference counting - if verbose and hasattr(sys, "gettotalrefcount"): - import gc - counts = [None] * 5 - for i in range(len(counts)): - test_support.run_doctest(test_genexps, verbose) - gc.collect() - counts[i] = sys.gettotalrefcount() - print(counts) - -if __name__ == "__main__": - test_main(verbose=True) -doctests = """ -########### Tests mostly copied from test_listcomps.py ############ - -Test simple loop with conditional - - >>> sum({i*i for i in range(100) if i&1 == 1}) - 166650 - -Test simple case - - >>> {2*y + x + 1 for x in (0,) for y in (1,)} - {3} - -Test simple nesting - - >>> list(sorted({(i,j) for i in range(3) for j in range(4)})) - [(0, 0), (0, 1), (0, 2), (0, 3), (1, 0), (1, 1), (1, 2), (1, 3), (2, 0), (2, 1), (2, 2), (2, 3)] - -Test nesting with the inner expression dependent on the outer - - >>> list(sorted({(i,j) for i in range(4) for j in range(i)})) - [(1, 0), (2, 0), (2, 1), (3, 0), (3, 1), (3, 2)] - -Make sure the induction variable is not exposed - - >>> i = 20 - >>> sum({i*i for i in range(100)}) - 328350 - - >>> i - 20 - -Verify that syntax error's are raised for setcomps used as lvalues - - >>> {y for y in (1,2)} = 10 # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - ... - SyntaxError: ... - - >>> {y for y in (1,2)} += 10 # doctest: +IGNORE_EXCEPTION_DETAIL - Traceback (most recent call last): - ... - SyntaxError: ... - - -Make a nested set comprehension that acts like set(range()) - - >>> def srange(n): - ... return {i for i in range(n)} - >>> list(sorted(srange(10))) - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - -Same again, only as a lambda expression instead of a function definition - - >>> lrange = lambda n: {i for i in range(n)} - >>> list(sorted(lrange(10))) - [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - -Generators can call other generators: - - >>> def grange(n): - ... for x in {i for i in range(n)}: - ... yield x - >>> list(sorted(grange(5))) - [0, 1, 2, 3, 4] - - -Make sure that None is a valid return value - - >>> {None for i in range(10)} - {None} - -########### Tests for various scoping corner cases ############ - -Return lambdas that use the iteration variable as a default argument - - >>> items = {(lambda i=i: i) for i in range(5)} - >>> {x() for x in items} == set(range(5)) - True - -Same again, only this time as a closure variable - - >>> items = {(lambda: i) for i in range(5)} - >>> {x() for x in items} - {4} - -Another way to test that the iteration variable is local to the list comp - - >>> items = {(lambda: i) for i in range(5)} - >>> i = 20 - >>> {x() for x in items} - {4} - -And confirm that a closure can jump over the list comp scope - - >>> items = {(lambda: y) for i in range(5)} - >>> y = 2 - >>> {x() for x in items} - {2} - -We also repeat each of the above scoping tests inside a function - - >>> def test_func(): - ... items = {(lambda i=i: i) for i in range(5)} - ... return {x() for x in items} - >>> test_func() == set(range(5)) - True - - >>> def test_func(): - ... items = {(lambda: i) for i in range(5)} - ... return {x() for x in items} - >>> test_func() - {4} - - >>> def test_func(): - ... items = {(lambda: i) for i in range(5)} - ... i = 20 - ... return {x() for x in items} - >>> test_func() - {4} - - >>> def test_func(): - ... items = {(lambda: y) for i in range(5)} - ... y = 2 - ... return {x() for x in items} - >>> test_func() - {2} - -""" - - -__test__ = {'doctests' : doctests} - -def test_main(verbose=None): - import sys - from test import test_support from test import test_setcomps test_support.run_doctest(test_setcomps, verbose) diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index dd5e019..d15f59c 100644 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -1,5 +1,6 @@ #! /usr/bin/env python """Interfaces for launching and remotely controlling Web browsers.""" +# Maintained by Georg Brandl. import os import shlex @@ -160,6 +161,7 @@ class GenericBrowser(BaseBrowser): def __init__(self, name): if isinstance(name, basestring): self.name = name + self.args = ["%s"] else: # name should be a list with arguments self.name = name[0] |