update doctests

diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst
index 54e552158a2356f808195c5e0a7683b5ba387ed0..6a435618285b905eb389b8eb53b47d4820a9af6b 100644 (file)
--- a/Doc/library/email.parser.rst
+++ b/Doc/library/email.parser.rst
@@ -251,7 +251,7 @@ in the top-level :mod:`email` package namespace.
 Here's an example of how you might use this at an interactive Python prompt::
 
    >>> import email
-   >>> msg = email.message_from_string(myString)
+   >>> msg = email.message_from_string(myString)  # doctest: +SKIP
 
 
 Additional notes

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 212b4e1d22718c2b58f0848982021e36c1b0070e..f23ccd7bc03552ae8c5e73948e46997028a6fe25 100644 (file)
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -305,17 +305,18 @@ are always available.  They are listed here in alphabetical order.
 
       >>> import struct
       >>> dir()   # show the names in the module namespace
-      ['__builtins__', '__doc__', '__name__', 'struct']
-      >>> dir(struct)   # show the names in the struct module
-      ['Struct', '__builtins__', '__doc__', '__file__', '__name__',
-       '__package__', '_clearcache', 'calcsize', 'error', 'pack', 'pack_into',
+      ['__builtins__', '__name__', 'struct']
+      >>> dir(struct)   # show the names in the struct module # doctest: +SKIP
+      ['Struct', '__all__', '__builtins__', '__cached__', '__doc__', '__file__',
+       '__initializing__', '__loader__', '__name__', '__package__',
+       '_clearcache', 'calcsize', 'error', 'pack', 'pack_into',
        'unpack', 'unpack_from']
       >>> class Shape(object):
-              def __dir__(self):
-                  return ['area', 'perimeter', 'location']
+      ...     def __dir__(self):
+      ...         return ['area', 'perimeter', 'location']
       >>> s = Shape()
       >>> dir(s)
-      ['area', 'perimeter', 'location']
+      ['area', 'location', 'perimeter']
 
    .. note::
 
@@ -614,9 +615,9 @@ are always available.  They are listed here in alphabetical order.
    to a string (stripping a trailing newline), and returns that.  When EOF is
    read, :exc:`EOFError` is raised.  Example::
 
-      >>> s = input('--> ')
+      >>> s = input('--> ')  # doctest: +SKIP
       --> Monty Python's Flying Circus
-      >>> s
+      >>> s  # doctest: +SKIP
       "Monty Python's Flying Circus"
 
    If the :mod:`readline` module was loaded, then :func:`input` will use it