summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-08-04 14:22:05 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-08-04 14:22:05 (GMT)
commit8576ca1970df20eed5cdaa665fec45419ffdeb15 (patch)
tree293173b33206c776502ceb5bfb47c348604965ef /Doc
parent5a44fa1430f9998dc1db8e73faf3fad96df117b6 (diff)
parent6bbc83986d0fc689ccaceb6bba14f0589332e76e (diff)
downloadcpython-8576ca1970df20eed5cdaa665fec45419ffdeb15.zip
cpython-8576ca1970df20eed5cdaa665fec45419ffdeb15.tar.gz
cpython-8576ca1970df20eed5cdaa665fec45419ffdeb15.tar.bz2
Merge from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ipaddress.rst11
1 files changed, 4 insertions, 7 deletions
diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
index 23526b6..2df2804 100644
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -24,6 +24,10 @@ This is the full module API reference—for an overview and introduction, see
.. versionadded:: 3.3
+.. testsetup::
+ >>> import ipaddress
+ >>> from ipaddress import (ip_network, IPv4Address, IPv4Interface,
+ ... IPv4Network)
Convenience factory functions
-----------------------------
@@ -39,13 +43,6 @@ IP addresses, networks and interfaces:
A :exc:`ValueError` is raised if *address* does not represent a valid IPv4
or IPv6 address.
-.. testsetup::
- >>> import ipaddress
- >>> from ipaddress import (ip_network, IPv4Address, IPv4Interface,
- ... IPv4Network)
-
-::
-
>>> ipaddress.ip_address('192.168.0.1')
IPv4Address('192.168.0.1')
>>> ipaddress.ip_address('2001:db8::')