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.
................

1 files changed, 0 insertions, 302 deletions

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)