diff -ur ../nitime-1fab57162a016351f530a7db2c77c1c1b3355476.orig/nitime/__init__.py ./nitime/__init__.py
--- ../nitime-1fab57162a016351f530a7db2c77c1c1b3355476.orig/nitime/__init__.py 2018-11-04 20:40:04.589524247 +0000
+++ ./nitime/__init__.py 2018-11-04 20:40:08.209500554 +0000
@@ -26,6 +26,5 @@
from . import algorithms
from . import timeseries
from . import analysis
-from . import six
from .timeseries import *
diff -ur ../nitime-1fab57162a016351f530a7db2c77c1c1b3355476.orig/nitime/timeseries.py ./nitime/timeseries.py
--- ../nitime-1fab57162a016351f530a7db2c77c1c1b3355476.orig/nitime/timeseries.py 2018-11-04 20:40:04.602524162 +0000
+++ ./nitime/timeseries.py 2018-11-04 20:40:08.210500548 +0000
@@ -32,7 +32,7 @@
# Our own
from nitime import descriptors as desc
-import nitime.six as six
+import six
#-----------------------------------------------------------------------------
# Module globals
diff -ur ../nitime-1fab57162a016351f530a7db2c77c1c1b3355476.orig/nitime/viz.py ./nitime/viz.py
--- ../nitime-1fab57162a016351f530a7db2c77c1c1b3355476.orig/nitime/viz.py 2018-11-04 20:40:04.603524156 +0000
+++ ./nitime/viz.py 2018-11-04 20:40:08.210500548 +0000
@@ -7,8 +7,8 @@
# If you are running nosetests right now, you might want to use 'agg' as a backend:
import sys
-from nitime.six.moves import map
-from nitime.six.moves import zip
+from six.moves import map
+from six.moves import zip
if "nose" in sys.modules:
import matplotlib
matplotlib.use('agg')
diff -ur ../nitime-1fab57162a016351f530a7db2c77c1c1b3355476.orig/tools/make_examples.py ./tools/make_examples.py
--- ../nitime-1fab57162a016351f530a7db2c77c1c1b3355476.orig/tools/make_examples.py 2018-11-04 20:40:04.603524156 +0000
+++ ./tools/make_examples.py 2018-11-04 20:40:23.859398120 +0000
@@ -15,15 +15,15 @@
# We must configure the mpl backend before making any further mpl imports
import matplotlib
+# Set MPL backend:
+matplotlib.use('Agg')
+
import matplotlib.pyplot as plt
from matplotlib._pylab_helpers import Gcf
# Local tools
from toollib import *
-# Set MPL backend:
-matplotlib.use('Agg')
-
# Globals:
examples_header = """