diff --git a/libs/Segment_Data.py b/libs/Segment_Data.py index 4571df7..baf95d8 100644 --- a/libs/Segment_Data.py +++ b/libs/Segment_Data.py @@ -1,8 +1,8 @@ """Helper functions to load segment data from runs.""" #from kzpy3.teg9.data.utils.preprocess_bag_data import * #from kzpy3.teg9.data.utils.Bag_File import * -from progress import * -from vis2 import * +from .progress import * +from .vis2 import * import sys @@ -133,7 +133,7 @@ def load_animate_hdf5(path,start_at_time=0): bar_color = [255, 0, 255] # Purple else: - print s[n][state][i] + print(s[n][state][i]) # black, show not be seen, indicates state 2 or 4. bar_color = [0, 0, 0] if i < 2: diff --git a/libs/progress.py b/libs/progress.py index 7b289b1..42e0db8 100755 --- a/libs/progress.py +++ b/libs/progress.py @@ -1,6 +1,6 @@ from __future__ import print_function -from utils2 import * +from .utils2 import * ########### ''' e.g. diff --git a/libs/utils2.py b/libs/utils2.py index 58bc025..c038014 100644 --- a/libs/utils2.py +++ b/libs/utils2.py @@ -22,7 +22,7 @@ 'sys', 'datetime', 'random', - 'cPickle', + 'pickle', 're', 'subprocess', 'serial', @@ -35,7 +35,7 @@ 'numbers'] import_from_list = [['FROM', 'pprint', 'pprint'], [ 'FROM', 'scipy.optimize', 'curve_fit'], ['FROM', 'termcolor', 'cprint']] -import_as_list = [['AS', 'numpy', 'np'], ['AS', 'cPickle', 'pickle']] +import_as_list = [['AS', 'numpy', 'np']] for im in import_list + import_from_list + import_as_list: if isinstance(im, str): @@ -304,7 +304,7 @@ def load_obj(name): if name.endswith('.pkl'): name = name[:-len('.pkl')] with open(name + '.pkl', 'rb') as f: - return pickle.load(f) + return pickle.load(f, encoding='latin1') lo = load_obj diff --git a/libs/vis2.py b/libs/vis2.py index f890f98..b3cdbc6 100644 --- a/libs/vis2.py +++ b/libs/vis2.py @@ -1,5 +1,5 @@ """Visualization utilities imported from kzpy3.""" -from utils2 import * +from .utils2 import * import matplotlib try: