summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-08-12 12:16:42 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-08-12 12:16:42 (GMT)
commit439e17fb0b0909457d36ee618c844c71c4e33398 (patch)
tree85a7f491300c34d7b5f8ea60e1926d5939e23130
parent199b78d41ae81ee33928bedbbc0910b98d4edc27 (diff)
downloadcpython-439e17fb0b0909457d36ee618c844c71c4e33398.zip
cpython-439e17fb0b0909457d36ee618c844c71c4e33398.tar.gz
cpython-439e17fb0b0909457d36ee618c844c71c4e33398.tar.bz2
update doctests
-rw-r--r--Doc/library/email.parser.rst2
-rw-r--r--Doc/library/functions.rst19
2 files changed, 11 insertions, 10 deletions
diff --git a/Doc/library/email.parser.rst b/Doc/library/email.parser.rst
index 54e5521..6a43561 100644
--- 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 212b4e1..f23ccd7 100644
--- 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