##// END OF EJS Templates
Fix python 2 compatibility
Juan C. Espinoza -
r1333:ac63616fef28 v3.0.0b2
parent child
Show More
@@ -5,4 +5,4 try:
5 except:
5 except:
6 pass
6 pass
7
7
8 __version__ = '3.0.0b1'
8 __version__ = '3.0.0b2'
@@ -1363,7 +1363,7 class PlotterData(object):
1363 Return the list of times of the current data
1363 Return the list of times of the current data
1364 '''
1364 '''
1365
1365
1366 ret = numpy.array([*self.data[self.key]])
1366 ret = numpy.array([t for t in self.data[self.key]])
1367 if self:
1367 if self:
1368 ret.sort()
1368 ret.sort()
1369 return ret
1369 return ret
@@ -5,7 +5,10 import zmq
5 import time
5 import time
6 import numpy
6 import numpy
7 import datetime
7 import datetime
8 from queue import Queue
8 try:
9 from queue import Queue
10 except:
11 from Queue import Queue
9 from functools import wraps
12 from functools import wraps
10 from threading import Thread
13 from threading import Thread
11 import matplotlib
14 import matplotlib
@@ -9,10 +9,6 import zmq
9 import time
9 import time
10 import pickle
10 import pickle
11 import traceback
11 import traceback
12 try:
13 from queue import Queue
14 except:
15 from Queue import Queue
16 from threading import Thread
12 from threading import Thread
17 from multiprocessing import Process, Queue
13 from multiprocessing import Process, Queue
18 from schainpy.utils import log
14 from schainpy.utils import log
General Comments 0
You need to be logged in to leave comments. Login now