Merge "Stop to use the __future__ module."2.0.0

4 files changed, 2 insertions, 8 deletions

diff --git a/doc/source/user/tutorial/loading.rst b/doc/source/user/tutorial/loading.rst
index 1f598c4..1a81084 100644
--- a/doc/source/user/tutorial/loading.rst
+++ b/doc/source/user/tutorial/loading.rst
@@ -41,7 +41,7 @@ called directly.
 
 .. literalinclude:: ../../../../stevedore/example/load_as_driver.py
    :language: python
-   :lines: 36-37
+   :lines: 34-35
 
 Running the example program produces this output:
 
@@ -95,7 +95,7 @@ printed and then the formatted data.
 
 .. literalinclude:: ../../../../stevedore/example/load_as_extension.py
    :language: python
-   :lines: 35-39
+   :lines: 33-37
 
 The order the plugins are loaded is undefined, and depends on the
 order packages are found on the import path as well as the way the
diff --git a/stevedore/example/load_as_driver.py b/stevedore/example/load_as_driver.py
index d8c47f5..6838c9d 100644
--- a/stevedore/example/load_as_driver.py
+++ b/stevedore/example/load_as_driver.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import argparse
 
 from stevedore import driver
diff --git a/stevedore/example/load_as_extension.py b/stevedore/example/load_as_extension.py
index 436206a..f751852 100644
--- a/stevedore/example/load_as_extension.py
+++ b/stevedore/example/load_as_extension.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import argparse
 
 from stevedore import extension
diff --git a/stevedore/tests/test_sphinxext.py b/stevedore/tests/test_sphinxext.py
index 60b4794..7abf2f6 100644
--- a/stevedore/tests/test_sphinxext.py
+++ b/stevedore/tests/test_sphinxext.py
@@ -12,8 +12,6 @@
 """Tests for the sphinx extension
 """
 
-from __future__ import unicode_literals
-
 from stevedore import extension
 from stevedore import sphinxext
 from stevedore.tests import utils