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