[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/f8d502ef21d9
changeset:   102532:f8d502ef21d9
parent:      102530:b04560c3ce69
parent:      102531:acf61d1cac51
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Thu Aug 04 17:22:05 2016 +0300
summary:
  Merge from 3.5

files:
  Doc/library/ipaddress.rst |  11 ++++-------
  1 files changed, 4 insertions(+), 7 deletions(-)


diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -24,6 +24,10 @@
 
 .. versionadded:: 3.3
 
+.. testsetup::
+   >>> import ipaddress
+   >>> from ipaddress import (ip_network, IPv4Address, IPv4Interface,
+   ...                        IPv4Network)
 
 Convenience factory functions
 -----------------------------
@@ -39,13 +43,6 @@
    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::')

-- 
Repository URL: https://hg.python.org/cpython