From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 12 Oct 2012 10:25:54 +0000 (+0300)
Subject: Merge doctest fixes in functional howto with 3.2.
X-Git-Tag: v3.4.0a1~2272^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb818193b3445f592b26804b2030fff81625e116;p=thirdparty%2FPython%2Fcpython.git

Merge doctest fixes in functional howto with 3.2.
---

eb818193b3445f592b26804b2030fff81625e116
diff --cc Doc/howto/functional.rst
index f298d897f1c3,ebbb229e570f..b621a84f56f0
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@@ -303,7 -298,7 +299,7 @@@ The :func:`dict` constructor can accep
  of ``(key, value)`` tuples:
  
      >>> L = [('Italy', 'Rome'), ('France', 'Paris'), ('US', 'Washington DC')]
--    >>> dict(iter(L))
++    >>> dict(iter(L))  #doctest: +SKIP
      {'Italy': 'Rome', 'US': 'Washington DC', 'France': 'Paris'}
  
  Files also support iteration by calling the :meth:`~io.TextIOBase.readline`