diff --git a/schainpy/__init__.py b/schainpy/__init__.py index b93e097..87a5e06 100644 --- a/schainpy/__init__.py +++ b/schainpy/__init__.py @@ -5,4 +5,4 @@ try: except: pass -__version__ = '3.0.0b1' +__version__ = '3.0.0b2' diff --git a/schainpy/model/data/jrodata.py b/schainpy/model/data/jrodata.py index 258e7e1..9878ea1 100644 --- a/schainpy/model/data/jrodata.py +++ b/schainpy/model/data/jrodata.py @@ -1363,7 +1363,7 @@ class PlotterData(object): Return the list of times of the current data ''' - ret = numpy.array([*self.data[self.key]]) + ret = numpy.array([t for t in self.data[self.key]]) if self: ret.sort() return ret diff --git a/schainpy/model/graphics/jroplot_base.py b/schainpy/model/graphics/jroplot_base.py index f3582ce..2f271e2 100644 --- a/schainpy/model/graphics/jroplot_base.py +++ b/schainpy/model/graphics/jroplot_base.py @@ -5,7 +5,10 @@ import zmq import time import numpy import datetime -from queue import Queue +try: + from queue import Queue +except: + from Queue import Queue from functools import wraps from threading import Thread import matplotlib diff --git a/schainpy/model/proc/jroproc_base.py b/schainpy/model/proc/jroproc_base.py index 62cb9d6..b359d8a 100644 --- a/schainpy/model/proc/jroproc_base.py +++ b/schainpy/model/proc/jroproc_base.py @@ -9,10 +9,6 @@ import zmq import time import pickle import traceback -try: - from queue import Queue -except: - from Queue import Queue from threading import Thread from multiprocessing import Process, Queue from schainpy.utils import log