From 293fd167cd8557ffc1aa7d7622426a510b613db2 Mon Sep 17 00:00:00 2001

From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>

Date: Thu, 1 Aug 2019 21:29:51 +0100

Subject: [PATCH] Remove six

---

 nitime/__init__.py   | 2 +-

 nitime/timeseries.py | 2 +-

 nitime/viz.py        | 4 ++--

 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nitime/__init__.py b/nitime/__init__.py

index 0c289dd..3facd41 100644

--- a/nitime/__init__.py

+++ b/nitime/__init__.py

@@ -26,6 +26,6 @@ from .version import  __version__

 from . import algorithms

 from . import timeseries

 from . import analysis

-from . import six

+import six

 from .timeseries import *

diff --git a/nitime/timeseries.py b/nitime/timeseries.py

index a918d20..53ad0db 100644

--- a/nitime/timeseries.py

+++ b/nitime/timeseries.py

@@ -32,7 +32,7 @@ import numpy as np

 # Our own

 from nitime import descriptors as desc

-import nitime.six as six

+import six

 #-----------------------------------------------------------------------------

 # Module globals

diff --git a/nitime/viz.py b/nitime/viz.py

index 0d8602d..05349b8 100644

--- a/nitime/viz.py

+++ b/nitime/viz.py

@@ -7,8 +7,8 @@ from __future__ import print_function

 # 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

 # Then do all the rest of it:

 import numpy as np

-- 

2.21.0