From 85ca8f61e570233585ed9cf58808188c65b5db60 Mon Sep 17 00:00:00 2001 From: dave <dave@dtu.dk> Date: Fri, 29 Jan 2016 20:16:25 +0100 Subject: [PATCH] apply pasteurize, but do not use os.getcwdu() --- wetb/__init__.py | 6 ++++ wetb/dlc/high_level.py | 10 ++++++ wetb/dlc/tests/test_high_level.py | 6 ++++ wetb/fast/fast_io.py | 9 ++++++ wetb/fast/tests/test_fast_io.py | 6 ++++ wetb/fatigue_tools/bearing_damage.py | 7 +++++ wetb/fatigue_tools/fatigue.py | 6 ++++ .../fatigue_tools/rainflowcounting/compile.py | 6 ++++ .../rainflowcounting/pair_range.py | 6 ++++ .../rainflowcounting/peak_trough.py | 6 ++++ .../rainflowcounting/rainflowcount.py | 7 +++++ .../rainflowcounting/rainflowcount_astm.py | 7 +++++ .../rainflowcounting/rfc_hist.py | 6 ++++ .../tests/test_bearing_damage.py | 6 ++++ wetb/fatigue_tools/tests/test_fatigue.py | 6 ++++ wetb/gtsdf/__init__.py | 6 ++++ wetb/gtsdf/gtsdf.py | 5 +++ wetb/gtsdf/tests/test_gtsdf.py | 8 +++++ wetb/gtsdf/tests/test_unix_time.py | 6 ++++ wetb/gtsdf/unix_time.py | 7 +++++ wetb/hawc2/Hawc2io.py | 13 +++++++- wetb/hawc2/__init__.py | 6 ++++ wetb/hawc2/ae_file.py | 9 ++++++ wetb/hawc2/ascii2bin/Example.py | 6 ++++ wetb/hawc2/ascii2bin/__init__.py | 6 ++++ wetb/hawc2/ascii2bin/ascii2bin.py | 8 +++++ wetb/hawc2/ascii2bin/make_exe.py | 2 ++ wetb/hawc2/ascii2bin/pandas_dat_ascii2bin.py | 7 +++++ wetb/hawc2/ascii2bin/tests/test_ascii2bin.py | 6 ++++ wetb/hawc2/at_time_file.py | 8 +++++ wetb/hawc2/cmp_test_cases.py | 10 ++++++ wetb/hawc2/htc_contents.py | 21 ++++++++++--- wetb/hawc2/htc_file.py | 8 +++++ wetb/hawc2/log_file.py | 14 +++++++-- wetb/hawc2/pc_file.py | 9 ++++++ wetb/hawc2/sel_file.py | 12 ++++++- wetb/hawc2/shear_file.py | 8 +++++ wetb/hawc2/simulation.py | 8 +++++ wetb/hawc2/tests/test_AtTimeFile.py | 6 ++++ wetb/hawc2/tests/test_ae_file.py | 6 ++++ wetb/hawc2/tests/test_compare_test_cases.py | 6 ++++ wetb/hawc2/tests/test_hawc2io.py | 6 ++++ wetb/hawc2/tests/test_htc_file.py | 9 ++++++ wetb/hawc2/tests/test_logfile.py | 7 +++++ wetb/hawc2/tests/test_pc_file.py | 6 ++++ wetb/hawc2/tests/test_sel_file.py | 6 ++++ wetb/hawc2/tests/test_shear_file.py | 7 +++++ wetb/prepost/DataChecks.py | 6 ++++ wetb/prepost/Simulations.py | 31 +++++++++++++------ wetb/prepost/dlcdefs.py | 7 +++++ wetb/prepost/dlcplots.py | 7 +++++ wetb/prepost/dlctemplate.py | 9 ++++++ wetb/prepost/filters.py | 9 +++++- wetb/prepost/h2_vs_hs2.py | 14 ++++++++- wetb/prepost/hawcstab2.py | 12 ++++++- wetb/prepost/misc.py | 14 ++++++++- wetb/prepost/mplutils.py | 10 ++++++ wetb/prepost/prepost.py | 7 +++++ wetb/prepost/windIO.py | 20 +++++++++--- wetb/utils/caching.py | 6 ++++ wetb/utils/cython_compile/__init__.py | 6 ++++ wetb/utils/cython_compile/cython_compile.py | 10 ++++++ wetb/utils/cython_compile/examples/cycheck.py | 8 +++++ .../utils/cython_compile/examples/examples.py | 8 +++++ wetb/utils/geometry.py | 7 +++++ wetb/utils/process_exec.py | 8 +++++ wetb/utils/tests/test_caching.py | 6 ++++ wetb/utils/tests/test_geometry.py | 6 ++++ wetb/utils/timing.py | 8 +++++ wetb/wind/shear.py | 6 ++++ wetb/wind/tests/test_Shear.py | 7 +++++ 71 files changed, 559 insertions(+), 25 deletions(-) diff --git a/wetb/__init__.py b/wetb/__init__.py index a49f1a1..6bd6d64 100644 --- a/wetb/__init__.py +++ b/wetb/__init__.py @@ -1,3 +1,9 @@ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import pkg_resources test = "TEST" try: diff --git a/wetb/dlc/high_level.py b/wetb/dlc/high_level.py index de50290..8b531fd 100644 --- a/wetb/dlc/high_level.py +++ b/wetb/dlc/high_level.py @@ -3,6 +3,16 @@ Created on 01/10/2014 @author: MMPE ''' +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import int +from builtins import map +from builtins import str +from builtins import zip +from future import standard_library +standard_library.install_aliases() import pandas as pd import numpy as np import glob diff --git a/wetb/dlc/tests/test_high_level.py b/wetb/dlc/tests/test_high_level.py index 3e931e8..94e67c0 100644 --- a/wetb/dlc/tests/test_high_level.py +++ b/wetb/dlc/tests/test_high_level.py @@ -3,6 +3,12 @@ Created on 09/10/2014 @author: MMPE ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest from wetb.dlc.high_level import DLCHighLevel, Weibull import os diff --git a/wetb/fast/fast_io.py b/wetb/fast/fast_io.py index 576fe69..42e99a6 100644 --- a/wetb/fast/fast_io.py +++ b/wetb/fast/fast_io.py @@ -3,6 +3,15 @@ Created on 03/09/2015 @author: MMPE ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from builtins import open +from builtins import map +from builtins import range +from future import standard_library +standard_library.install_aliases() import os import numpy as np import struct diff --git a/wetb/fast/tests/test_fast_io.py b/wetb/fast/tests/test_fast_io.py index cd65655..187dccf 100644 --- a/wetb/fast/tests/test_fast_io.py +++ b/wetb/fast/tests/test_fast_io.py @@ -3,6 +3,12 @@ Created on 03/09/2015 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest from wetb.fast.fast_io import load_output diff --git a/wetb/fatigue_tools/bearing_damage.py b/wetb/fatigue_tools/bearing_damage.py index 04af76d..fa509db 100644 --- a/wetb/fatigue_tools/bearing_damage.py +++ b/wetb/fatigue_tools/bearing_damage.py @@ -3,6 +3,13 @@ Created on 13/10/2014 @author: MMPE ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from builtins import zip +from future import standard_library +standard_library.install_aliases() def bearing_damage(angle_moment_lst, m=3, thresshold=0.1): """Function ported from Matlab. diff --git a/wetb/fatigue_tools/fatigue.py b/wetb/fatigue_tools/fatigue.py index 98bad48..e26089c 100644 --- a/wetb/fatigue_tools/fatigue.py +++ b/wetb/fatigue_tools/fatigue.py @@ -14,6 +14,12 @@ or - 'rainflow_astm' (based on the c-implementation by Adam Nieslony found at the MATLAB Central File Exchange http://www.mathworks.com/matlabcentral/fileexchange/3026) ''' +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import numpy as np from wetb.fatigue_tools.rainflowcounting import rainflowcount diff --git a/wetb/fatigue_tools/rainflowcounting/compile.py b/wetb/fatigue_tools/rainflowcounting/compile.py index caa0465..ba45766 100644 --- a/wetb/fatigue_tools/rainflowcounting/compile.py +++ b/wetb/fatigue_tools/rainflowcounting/compile.py @@ -1,3 +1,9 @@ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() from wetb.utils.cython_compile.cython_compile import cython_import cython_import('pair_range') cython_import('peak_trough') diff --git a/wetb/fatigue_tools/rainflowcounting/pair_range.py b/wetb/fatigue_tools/rainflowcounting/pair_range.py index 6a493d7..c3048fa 100644 --- a/wetb/fatigue_tools/rainflowcounting/pair_range.py +++ b/wetb/fatigue_tools/rainflowcounting/pair_range.py @@ -1,3 +1,9 @@ +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import cython import numpy as np diff --git a/wetb/fatigue_tools/rainflowcounting/peak_trough.py b/wetb/fatigue_tools/rainflowcounting/peak_trough.py index fc6bde6..7ae9b20 100644 --- a/wetb/fatigue_tools/rainflowcounting/peak_trough.py +++ b/wetb/fatigue_tools/rainflowcounting/peak_trough.py @@ -1,3 +1,9 @@ +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import cython import numpy as np #cimport numpy as np diff --git a/wetb/fatigue_tools/rainflowcounting/rainflowcount.py b/wetb/fatigue_tools/rainflowcounting/rainflowcount.py index 304cf57..645da85 100644 --- a/wetb/fatigue_tools/rainflowcounting/rainflowcount.py +++ b/wetb/fatigue_tools/rainflowcounting/rainflowcount.py @@ -1,3 +1,10 @@ +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from builtins import str +from future import standard_library +standard_library.install_aliases() import numpy as np from wetb.utils.cython_compile.cython_compile import cython_import diff --git a/wetb/fatigue_tools/rainflowcounting/rainflowcount_astm.py b/wetb/fatigue_tools/rainflowcounting/rainflowcount_astm.py index 06924c5..2cb2b2d 100644 --- a/wetb/fatigue_tools/rainflowcounting/rainflowcount_astm.py +++ b/wetb/fatigue_tools/rainflowcounting/rainflowcount_astm.py @@ -13,6 +13,13 @@ from cy_rainflowcount import find_extremes,rainflow ext = find_extremes(np.array([-2,0,1,0,-3,0,5,0,-1,0,3,0,-4,0,4,0,-2]).astype(np.double)) print rainflow(ext) ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from builtins import range +from future import standard_library +standard_library.install_aliases() import numpy as np diff --git a/wetb/fatigue_tools/rainflowcounting/rfc_hist.py b/wetb/fatigue_tools/rainflowcounting/rfc_hist.py index c7883e0..65d3c00 100644 --- a/wetb/fatigue_tools/rainflowcounting/rfc_hist.py +++ b/wetb/fatigue_tools/rainflowcounting/rfc_hist.py @@ -1,3 +1,9 @@ +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import numpy as np def rfc_hist(sig_rf, nrbins=46): """Histogram of rainflow counted cycles diff --git a/wetb/fatigue_tools/tests/test_bearing_damage.py b/wetb/fatigue_tools/tests/test_bearing_damage.py index a4ece3a..37e33b4 100644 --- a/wetb/fatigue_tools/tests/test_bearing_damage.py +++ b/wetb/fatigue_tools/tests/test_bearing_damage.py @@ -3,6 +3,12 @@ Created on 16/07/2013 @author: mmpe ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest diff --git a/wetb/fatigue_tools/tests/test_fatigue.py b/wetb/fatigue_tools/tests/test_fatigue.py index f5cb6bf..904c871 100644 --- a/wetb/fatigue_tools/tests/test_fatigue.py +++ b/wetb/fatigue_tools/tests/test_fatigue.py @@ -3,6 +3,12 @@ Created on 16/07/2013 @author: mmpe ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest diff --git a/wetb/gtsdf/__init__.py b/wetb/gtsdf/__init__.py index d31e802..0ba3291 100644 --- a/wetb/gtsdf/__init__.py +++ b/wetb/gtsdf/__init__.py @@ -24,6 +24,12 @@ This module contains three methods: .. _append_block: gtsdf.html#gtsdf.append_block """ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() d = None d = dir() diff --git a/wetb/gtsdf/gtsdf.py b/wetb/gtsdf/gtsdf.py index ae72830..396695b 100644 --- a/wetb/gtsdf/gtsdf.py +++ b/wetb/gtsdf/gtsdf.py @@ -1,4 +1,9 @@ from __future__ import division, print_function, absolute_import, unicode_literals +from builtins import zip +from builtins import range +from builtins import str +from future import standard_library +standard_library.install_aliases() import warnings from wetb.gtsdf.unix_time import from_unix try: diff --git a/wetb/gtsdf/tests/test_gtsdf.py b/wetb/gtsdf/tests/test_gtsdf.py index 64a1702..c70016f 100644 --- a/wetb/gtsdf/tests/test_gtsdf.py +++ b/wetb/gtsdf/tests/test_gtsdf.py @@ -3,6 +3,14 @@ Created on 12/09/2013 @author: mmpe ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from builtins import super +from builtins import range +from future import standard_library +standard_library.install_aliases() import h5py import numpy as np diff --git a/wetb/gtsdf/tests/test_unix_time.py b/wetb/gtsdf/tests/test_unix_time.py index 3a5987b..e69f281 100644 --- a/wetb/gtsdf/tests/test_unix_time.py +++ b/wetb/gtsdf/tests/test_unix_time.py @@ -3,6 +3,12 @@ Created on 03/12/2015 @author: mmpe ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest import numpy as np import datetime diff --git a/wetb/gtsdf/unix_time.py b/wetb/gtsdf/unix_time.py index e01d816..48c7414 100644 --- a/wetb/gtsdf/unix_time.py +++ b/wetb/gtsdf/unix_time.py @@ -1,3 +1,10 @@ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from builtins import zip +from future import standard_library +standard_library.install_aliases() from datetime import datetime, date import numpy as np timestamp0 = datetime.utcfromtimestamp(0) diff --git a/wetb/hawc2/Hawc2io.py b/wetb/hawc2/Hawc2io.py index 7324210..a07fa47 100644 --- a/wetb/hawc2/Hawc2io.py +++ b/wetb/hawc2/Hawc2io.py @@ -27,6 +27,17 @@ Need to be done: * add error handling for allmost every thing """ +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import int +from builtins import range +from builtins import open +from builtins import str +from future import standard_library +standard_library.install_aliases() +from builtins import object import numpy as np import os ################################################################################ @@ -34,7 +45,7 @@ import os ################################################################################ ## Read HAWC2 class ################################################################################ -class ReadHawc2: +class ReadHawc2(object): """ """ ################################################################################ diff --git a/wetb/hawc2/__init__.py b/wetb/hawc2/__init__.py index dc81279..36c882e 100644 --- a/wetb/hawc2/__init__.py +++ b/wetb/hawc2/__init__.py @@ -1,3 +1,9 @@ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() d = None d = dir() diff --git a/wetb/hawc2/ae_file.py b/wetb/hawc2/ae_file.py index 1ddad3a..6d9c81f 100644 --- a/wetb/hawc2/ae_file.py +++ b/wetb/hawc2/ae_file.py @@ -3,6 +3,15 @@ Created on 24/04/2014 @author: MMPE ''' +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division +from __future__ import absolute_import +from builtins import open +from builtins import range +from builtins import int +from future import standard_library +standard_library.install_aliases() import numpy as np diff --git a/wetb/hawc2/ascii2bin/Example.py b/wetb/hawc2/ascii2bin/Example.py index 78bdabc..3878524 100644 --- a/wetb/hawc2/ascii2bin/Example.py +++ b/wetb/hawc2/ascii2bin/Example.py @@ -3,6 +3,12 @@ Created on 06/09/2013 @author: Mads M. Pedersen (mmpe@dtu.dk) ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() from wetb.hawc2.ascii2bin.ascii2bin import ascii2bin diff --git a/wetb/hawc2/ascii2bin/__init__.py b/wetb/hawc2/ascii2bin/__init__.py index d474090..75704d4 100644 --- a/wetb/hawc2/ascii2bin/__init__.py +++ b/wetb/hawc2/ascii2bin/__init__.py @@ -1,6 +1,12 @@ """ General Time Series Data Format - a HDF5 format for time series """ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() d = None d = dir() diff --git a/wetb/hawc2/ascii2bin/ascii2bin.py b/wetb/hawc2/ascii2bin/ascii2bin.py index 400baed..11a0971 100644 --- a/wetb/hawc2/ascii2bin/ascii2bin.py +++ b/wetb/hawc2/ascii2bin/ascii2bin.py @@ -1,3 +1,11 @@ +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division +from __future__ import absolute_import +from builtins import open +from builtins import int +from future import standard_library +standard_library.install_aliases() import sys import warnings diff --git a/wetb/hawc2/ascii2bin/make_exe.py b/wetb/hawc2/ascii2bin/make_exe.py index 6e785db..7e31b83 100644 --- a/wetb/hawc2/ascii2bin/make_exe.py +++ b/wetb/hawc2/ascii2bin/make_exe.py @@ -4,6 +4,8 @@ Created on 06/09/2013 @author: Mads M. Pedersen (mmpe@dtu.dk) ''' from __future__ import division, print_function, absolute_import, unicode_literals +from future import standard_library +standard_library.install_aliases() from build_exe.cx.build_cx_exe import NUMPY try: range = xrange; xrange = None except NameError: pass diff --git a/wetb/hawc2/ascii2bin/pandas_dat_ascii2bin.py b/wetb/hawc2/ascii2bin/pandas_dat_ascii2bin.py index f6b29a2..059d581 100644 --- a/wetb/hawc2/ascii2bin/pandas_dat_ascii2bin.py +++ b/wetb/hawc2/ascii2bin/pandas_dat_ascii2bin.py @@ -3,6 +3,13 @@ Created on 10/01/2014 @author: MMPE ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from builtins import open +from future import standard_library +standard_library.install_aliases() import numpy as np from pandas import read_csv diff --git a/wetb/hawc2/ascii2bin/tests/test_ascii2bin.py b/wetb/hawc2/ascii2bin/tests/test_ascii2bin.py index f802642..889f178 100644 --- a/wetb/hawc2/ascii2bin/tests/test_ascii2bin.py +++ b/wetb/hawc2/ascii2bin/tests/test_ascii2bin.py @@ -3,6 +3,12 @@ Created on 29/10/2013 @author: mmpe ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() from wetb.hawc2 import Hawc2io import numpy as np import os diff --git a/wetb/hawc2/at_time_file.py b/wetb/hawc2/at_time_file.py index 68abb64..bc1bb4f 100644 --- a/wetb/hawc2/at_time_file.py +++ b/wetb/hawc2/at_time_file.py @@ -3,6 +3,14 @@ Created on 24/04/2014 @author: MMPE ''' +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division +from __future__ import absolute_import +from builtins import open +from builtins import range +from future import standard_library +standard_library.install_aliases() import numpy as np class AtTimeFile(object): diff --git a/wetb/hawc2/cmp_test_cases.py b/wetb/hawc2/cmp_test_cases.py index 9acd535..b1d4f1a 100644 --- a/wetb/hawc2/cmp_test_cases.py +++ b/wetb/hawc2/cmp_test_cases.py @@ -1,3 +1,13 @@ +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import open +from builtins import range +from builtins import str +from builtins import zip +from future import standard_library +standard_library.install_aliases() import string import shutil import numpy as np diff --git a/wetb/hawc2/htc_contents.py b/wetb/hawc2/htc_contents.py index 9b86dd6..6b76a14 100644 --- a/wetb/hawc2/htc_contents.py +++ b/wetb/hawc2/htc_contents.py @@ -6,6 +6,15 @@ Created on 20/01/2014 See documentation of HTCFile below ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from builtins import zip +from builtins import int +from builtins import str +from future import standard_library +standard_library.install_aliases() from collections import OrderedDict import collections @@ -18,7 +27,8 @@ class OrderedDict(collections.OrderedDict): def parse_next_line(lines): - line, *comments = lines.pop(0).split(";") + _3to2list = list(lines.pop(0).split(";")) + line, comments, = _3to2list[:1] + [_3to2list[1:]] comments = ";".join(comments).rstrip() while lines and lines[0].lstrip().startswith(";"): comments += "\n%s" % lines.pop(0).rstrip() @@ -52,7 +62,8 @@ class HTCContents(object): return self.contents[args[0]] def __setattr__(self, *args, **kwargs): - k, *v = args + _3to2list1 = list(args) + k, v, = _3to2list1[:1] + [_3to2list1[1:]] if k in dir(self): # in ['section', 'filename', 'lines']: return object.__setattr__(self, *args, **kwargs) self.contents[k] = HTCLine(k, v, "") @@ -163,7 +174,8 @@ class HTCLine(HTCContents): def from_lines(lines): line, end_comments = parse_next_line(lines) if len(line.split()) > 0: - name, *values = line.split() + _3to2list3 = list(line.split()) + name, values, = _3to2list3[:1] + [_3to2list3[1:]] else: name = line values = [] @@ -245,7 +257,8 @@ class HTCSensor(HTCLine): def from_lines(lines): line, comments = parse_next_line(lines) if len(line.split()) > 2: - type, sensor, *values = line.split() + _3to2list5 = list(line.split()) + type, sensor, values, = _3to2list5[:2] + [_3to2list5[2:]] else: type, sensor = line.split() values = [] diff --git a/wetb/hawc2/htc_file.py b/wetb/hawc2/htc_file.py index e8a7f94..709637c 100644 --- a/wetb/hawc2/htc_file.py +++ b/wetb/hawc2/htc_file.py @@ -6,6 +6,14 @@ Created on 20/01/2014 See documentation of HTCFile below ''' +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division +from __future__ import absolute_import +from builtins import open +from builtins import str +from future import standard_library +standard_library.install_aliases() from collections import OrderedDict from wetb.hawc2.htc_contents import HTCContents, HTCSection, HTCLine, \ diff --git a/wetb/hawc2/log_file.py b/wetb/hawc2/log_file.py index d049610..7d051ea 100644 --- a/wetb/hawc2/log_file.py +++ b/wetb/hawc2/log_file.py @@ -3,6 +3,14 @@ Created on 18/11/2015 @author: MMPE ''' +from __future__ import print_function +from __future__ import division +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import open +from builtins import int +from future import standard_library +standard_library.install_aliases() import os from wetb.hawc2.htc_file import HTCFile from collections import OrderedDict @@ -98,7 +106,8 @@ class LogFile(object): if len(txt.strip()): self.lastline = (txt.strip()[max(0, txt.strip().rfind("\n")):]).strip() if self.status == INITIALIZATION: - init_txt, *rest = txt.split("Starting simulation") + _3to2list = list(txt.split("Starting simulation")) + init_txt, rest, = _3to2list[:1] + [_3to2list[1:]] if self.hawc2version == "Unknown" and "Version ID" in init_txt: self.hawc2version = txt.split("Version ID : ")[1].split("\n", 1)[0].strip() if "*** ERROR ***" in init_txt: @@ -113,7 +122,8 @@ class LogFile(object): if i1 > -1: self.start_time = (self.extract_time(txt[i1:]), time.time()) - simulation_txt, *rest = txt.split('Elapsed time') + _3to2list1 = list(txt.split('Elapsed time')) + simulation_txt, rest, = _3to2list1[:1] + [_3to2list1[1:]] if "*** ERROR ***" in simulation_txt: self.errors.extend([l.strip() for l in simulation_txt.strip().split("\n") if "error" in l.lower()]) i1 = simulation_txt.rfind("Global time") diff --git a/wetb/hawc2/pc_file.py b/wetb/hawc2/pc_file.py index 92ff0d0..49893db 100644 --- a/wetb/hawc2/pc_file.py +++ b/wetb/hawc2/pc_file.py @@ -3,6 +3,15 @@ Created on 24/04/2014 @author: MMPE ''' +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import open +from builtins import range +from builtins import int +from future import standard_library +standard_library.install_aliases() from wetb.hawc2.ae_file import AEFile import numpy as np diff --git a/wetb/hawc2/sel_file.py b/wetb/hawc2/sel_file.py index f6f0e6a..a01c018 100644 --- a/wetb/hawc2/sel_file.py +++ b/wetb/hawc2/sel_file.py @@ -1,3 +1,13 @@ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from builtins import open +from builtins import str +from builtins import int +from future import standard_library +standard_library.install_aliases() +from builtins import object from datetime import datetime import os import numpy as np @@ -5,7 +15,7 @@ import numpy as np BINARY = "BINARY" ASCII = "ASCII" -class SelFile(): +class SelFile(object): """Class for reading HAWC2 sel-files Attributes ---------- diff --git a/wetb/hawc2/shear_file.py b/wetb/hawc2/shear_file.py index b0e8126..03413ab 100644 --- a/wetb/hawc2/shear_file.py +++ b/wetb/hawc2/shear_file.py @@ -3,6 +3,14 @@ Created on 24/04/2014 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from builtins import range +from builtins import open +from future import standard_library +standard_library.install_aliases() import numpy as np import os diff --git a/wetb/hawc2/simulation.py b/wetb/hawc2/simulation.py index 3afc961..db26a98 100644 --- a/wetb/hawc2/simulation.py +++ b/wetb/hawc2/simulation.py @@ -1,3 +1,11 @@ +from __future__ import print_function +from __future__ import division +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import open +from builtins import str +from future import standard_library +standard_library.install_aliases() import os from wetb.hawc2.htc_file import HTCFile from wetb.hawc2.log_file import LogFile diff --git a/wetb/hawc2/tests/test_AtTimeFile.py b/wetb/hawc2/tests/test_AtTimeFile.py index 77943ee..8f1fae9 100644 --- a/wetb/hawc2/tests/test_AtTimeFile.py +++ b/wetb/hawc2/tests/test_AtTimeFile.py @@ -3,6 +3,12 @@ Created on 17/07/2014 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest from wetb.hawc2.at_time_file import AtTimeFile import numpy as np diff --git a/wetb/hawc2/tests/test_ae_file.py b/wetb/hawc2/tests/test_ae_file.py index 2dc82ae..4e57189 100644 --- a/wetb/hawc2/tests/test_ae_file.py +++ b/wetb/hawc2/tests/test_ae_file.py @@ -3,6 +3,12 @@ Created on 05/11/2015 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest from wetb.hawc2.ae_file import AEFile import os diff --git a/wetb/hawc2/tests/test_compare_test_cases.py b/wetb/hawc2/tests/test_compare_test_cases.py index 4d6118c..e9ef617 100644 --- a/wetb/hawc2/tests/test_compare_test_cases.py +++ b/wetb/hawc2/tests/test_compare_test_cases.py @@ -3,6 +3,12 @@ Created on 17/07/2014 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest from wetb.hawc2.cmp_test_cases import CompareTestCases import numpy as np diff --git a/wetb/hawc2/tests/test_hawc2io.py b/wetb/hawc2/tests/test_hawc2io.py index f8e0b09..4d83a2e 100644 --- a/wetb/hawc2/tests/test_hawc2io.py +++ b/wetb/hawc2/tests/test_hawc2io.py @@ -3,6 +3,12 @@ Created on 05/11/2015 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest import numpy as np from wetb.hawc2.Hawc2io import ReadHawc2 diff --git a/wetb/hawc2/tests/test_htc_file.py b/wetb/hawc2/tests/test_htc_file.py index 04eb595..013f08d 100644 --- a/wetb/hawc2/tests/test_htc_file.py +++ b/wetb/hawc2/tests/test_htc_file.py @@ -3,6 +3,15 @@ Created on 17/07/2014 @author: MMPE ''' +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division +from __future__ import absolute_import +from builtins import open +from builtins import str +from builtins import zip +from future import standard_library +standard_library.install_aliases() import os import unittest diff --git a/wetb/hawc2/tests/test_logfile.py b/wetb/hawc2/tests/test_logfile.py index 170f83e..1760c98 100644 --- a/wetb/hawc2/tests/test_logfile.py +++ b/wetb/hawc2/tests/test_logfile.py @@ -3,6 +3,13 @@ Created on 18/11/2015 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from builtins import open +from future import standard_library +standard_library.install_aliases() import unittest from wetb.hawc2.log_file import LogFile, \ INITIALIZATION, SIMULATING, DONE, PENDING diff --git a/wetb/hawc2/tests/test_pc_file.py b/wetb/hawc2/tests/test_pc_file.py index aeaaa5e..e5a7027 100644 --- a/wetb/hawc2/tests/test_pc_file.py +++ b/wetb/hawc2/tests/test_pc_file.py @@ -3,6 +3,12 @@ Created on 17/07/2014 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import os import unittest from wetb.hawc2.pc_file import PCFile diff --git a/wetb/hawc2/tests/test_sel_file.py b/wetb/hawc2/tests/test_sel_file.py index f6e1b51..d7593ae 100644 --- a/wetb/hawc2/tests/test_sel_file.py +++ b/wetb/hawc2/tests/test_sel_file.py @@ -3,6 +3,12 @@ Created on 17/07/2014 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest from wetb.hawc2.sel_file import SelFile, BINARY, ASCII from datetime import datetime diff --git a/wetb/hawc2/tests/test_shear_file.py b/wetb/hawc2/tests/test_shear_file.py index 19f307a..3418f98 100644 --- a/wetb/hawc2/tests/test_shear_file.py +++ b/wetb/hawc2/tests/test_shear_file.py @@ -3,6 +3,13 @@ Created on 05/11/2015 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from builtins import open +from future import standard_library +standard_library.install_aliases() import unittest from wetb.hawc2 import shear_file import numpy as np diff --git a/wetb/prepost/DataChecks.py b/wetb/prepost/DataChecks.py index e241210..58dd473 100644 --- a/wetb/prepost/DataChecks.py +++ b/wetb/prepost/DataChecks.py @@ -4,6 +4,12 @@ Created on Mon Mar 5 16:00:02 2012 @author: dave """ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py index 5847a5a..5d5b2a0 100755 --- a/wetb/prepost/Simulations.py +++ b/wetb/prepost/Simulations.py @@ -6,6 +6,19 @@ Created on Tue Nov 1 15:16:34 2011 __author__ = "David Verelst <dave@dtu.dk>" __license__ = "GPL-2+" """ +from __future__ import print_function +from __future__ import division +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import dict +from builtins import open +from builtins import zip +from builtins import range +from builtins import str +from builtins import int +from future import standard_library +standard_library.install_aliases() +from builtins import object @@ -1201,7 +1214,7 @@ def logcheck_case(errorlogs, cases, case, silent=False): #errorlogs.save() -class Log: +class Log(object): """ Class for convinient logging. Create an instance and add lines to the logfile as a list with the function add. @@ -1237,7 +1250,7 @@ class Log: for k in self.log: print(k) -class HtcMaster: +class HtcMaster(object): """ """ @@ -1828,7 +1841,7 @@ class HtcMaster: self.tags[key] = self.tags[key].lower() -class PBS: +class PBS(object): """ The part where the actual pbs script is writtin in this class (functions create(), starting() and ending() ) is based on the MS Excel macro @@ -2452,7 +2465,7 @@ class PBS: # TODO: rewrite the error log analysis to something better. Take different # approach: start from the case and see if the results are present. Than we # also have the tags_dict available when log-checking a certain case -class ErrorLogs: +class ErrorLogs(object): """ Analyse all HAWC2 log files in any given directory ================================================== @@ -2836,12 +2849,12 @@ class ErrorLogs: f.write(contents) -class ModelData: +class ModelData(object): """ Second generation ModelData function. The HawcPy version is crappy, buggy and not mutch of use in the optimisation context. """ - class st_headers: + class st_headers(object): """ Indices to the respective parameters in the HAWC2 st data file """ @@ -3261,7 +3274,7 @@ class WeibullParameters(object): # FIXME: Cases has a memory leek somewhere, this whole thing needs to be # reconsidered and rely on a DataFrame instead of a dict! -class Cases: +class Cases(object): """ Class for the old htc_dict ========================== @@ -4947,7 +4960,7 @@ class Cases: h5f.close() -class EnvelopeClass: +class EnvelopeClass(object): """ Class with the definition of the table for the envelope results """ @@ -4962,7 +4975,7 @@ class EnvelopeClass: # TODO: implement this -class Results(): +class Results(object): """ Move all Hawc2io to here? NO: this should be the wrapper, to interface the htc_dict with the io functions diff --git a/wetb/prepost/dlcdefs.py b/wetb/prepost/dlcdefs.py index 8627cb1..21dd670 100644 --- a/wetb/prepost/dlcdefs.py +++ b/wetb/prepost/dlcdefs.py @@ -4,6 +4,13 @@ Created on Wed Nov 5 14:01:25 2014 @author: dave """ +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division +from __future__ import absolute_import +from builtins import str +from future import standard_library +standard_library.install_aliases() diff --git a/wetb/prepost/dlcplots.py b/wetb/prepost/dlcplots.py index 880d5ae..1d5b3e1 100644 --- a/wetb/prepost/dlcplots.py +++ b/wetb/prepost/dlcplots.py @@ -4,6 +4,13 @@ Created on Tue Sep 16 10:21:11 2014 @author: dave """ +from __future__ import print_function +from __future__ import division +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import str +from future import standard_library +standard_library.install_aliases() diff --git a/wetb/prepost/dlctemplate.py b/wetb/prepost/dlctemplate.py index 47d795b..39d1b00 100755 --- a/wetb/prepost/dlctemplate.py +++ b/wetb/prepost/dlctemplate.py @@ -4,6 +4,15 @@ Created on Thu Sep 18 13:00:25 2014 @author: dave """ +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division +from __future__ import absolute_import +from builtins import dict +from builtins import str +from builtins import range +from future import standard_library +standard_library.install_aliases() diff --git a/wetb/prepost/filters.py b/wetb/prepost/filters.py index 760ffe2..22f6fd6 100644 --- a/wetb/prepost/filters.py +++ b/wetb/prepost/filters.py @@ -4,6 +4,13 @@ Created on Sun Jan 20 18:14:02 2013 @author: dave """ +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() +from builtins import object @@ -16,7 +23,7 @@ from wetb.prepost.misc import calc_sample_rate from wetb.prepost import mplutils -class Filters: +class Filters(object): def __init__(self): pass diff --git a/wetb/prepost/h2_vs_hs2.py b/wetb/prepost/h2_vs_hs2.py index 752bca8..f0d1f14 100644 --- a/wetb/prepost/h2_vs_hs2.py +++ b/wetb/prepost/h2_vs_hs2.py @@ -4,6 +4,18 @@ Created on Mon Nov 2 15:23:15 2015 @author: dave """ +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import range +from builtins import zip +from builtins import dict +from builtins import str +from builtins import int +from future import standard_library +standard_library.install_aliases() +from builtins import object import os @@ -18,7 +30,7 @@ from wetb.prepost import hawcstab2 as hs2 from wetb.prepost import mplutils -class ConfigBase: +class ConfigBase(object): def __init__(self): pass diff --git a/wetb/prepost/hawcstab2.py b/wetb/prepost/hawcstab2.py index c1afefe..5597f2c 100644 --- a/wetb/prepost/hawcstab2.py +++ b/wetb/prepost/hawcstab2.py @@ -4,6 +4,16 @@ Created on Tue Jan 14 14:12:58 2014 @author: dave """ +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import range +from builtins import open +from builtins import int +from future import standard_library +standard_library.install_aliases() +from builtins import object @@ -17,7 +27,7 @@ import pandas as pd from wetb.prepost import mplutils -class dummy: +class dummy(object): def __init__(self): pass diff --git a/wetb/prepost/misc.py b/wetb/prepost/misc.py index 0c7bd3b..965c24b 100644 --- a/wetb/prepost/misc.py +++ b/wetb/prepost/misc.py @@ -6,6 +6,18 @@ Library for general stuff @author: dave """ +from __future__ import print_function +from __future__ import division +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import range +from builtins import dict +from builtins import int +from builtins import open +from builtins import str +from future import standard_library +standard_library.install_aliases() +from builtins import object @@ -27,7 +39,7 @@ from matplotlib import pyplot as plt import pandas as pd -class Logger: +class Logger(object): """The Logger class can be used to redirect standard output to a log file. Usage: Create a Logger object and redirect standard output to the Logger object. For example: diff --git a/wetb/prepost/mplutils.py b/wetb/prepost/mplutils.py index e77b0b0..b8ca174 100644 --- a/wetb/prepost/mplutils.py +++ b/wetb/prepost/mplutils.py @@ -4,6 +4,16 @@ Created on Wed Nov 23 11:22:50 2011 @author: dave """ +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import range +from builtins import int +from builtins import dict +from builtins import round +from future import standard_library +standard_library.install_aliases() diff --git a/wetb/prepost/prepost.py b/wetb/prepost/prepost.py index 0aa94dd..44898d1 100644 --- a/wetb/prepost/prepost.py +++ b/wetb/prepost/prepost.py @@ -4,6 +4,13 @@ Created on Tue Mar 10 18:47:32 2015 @author: dave """ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from builtins import open +from future import standard_library +standard_library.install_aliases() diff --git a/wetb/prepost/windIO.py b/wetb/prepost/windIO.py index 162e220..b166e14 100755 --- a/wetb/prepost/windIO.py +++ b/wetb/prepost/windIO.py @@ -4,6 +4,18 @@ Created on Thu Apr 3 19:53:59 2014 @author: dave """ +from __future__ import print_function +from __future__ import division +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import dict +from builtins import open +from builtins import range +from builtins import str +from builtins import int +from future import standard_library +standard_library.install_aliases() +from builtins import object # always devide as floats @@ -39,7 +51,7 @@ from wetb.fatigue_tools.rainflowcounting.rainflowcount import rainflow_astm as r from wetb.fatigue_tools.rainflowcounting.rfc_hist import rfc_hist as rfc_hist -class LoadResults: +class LoadResults(object): """Read a HAWC2 result data file Usage: @@ -1275,7 +1287,7 @@ def ReadEigenStructure(file_path, file_name, debug=False, max_modes=500): return modes_arr -class UserWind: +class UserWind(object): """ """ @@ -1533,7 +1545,7 @@ class UserWind: np.savetxt(f, w_coord.reshape((w_coord.size,1)), fmt='% 8.02f') -class WindProfiles: +class WindProfiles(object): def __init__(self): pass @@ -1588,7 +1600,7 @@ class WindProfiles: return a_phi * t1 * t2 * t3 -class Turbulence: +class Turbulence(object): def __init__(self): diff --git a/wetb/utils/caching.py b/wetb/utils/caching.py index 184825e..6f5df27 100644 --- a/wetb/utils/caching.py +++ b/wetb/utils/caching.py @@ -3,6 +3,12 @@ Created on 07/02/2014 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import inspect def set_cache_property(obj, name, get_func, set_func=None): diff --git a/wetb/utils/cython_compile/__init__.py b/wetb/utils/cython_compile/__init__.py index 8d7b1d7..7db504d 100644 --- a/wetb/utils/cython_compile/__init__.py +++ b/wetb/utils/cython_compile/__init__.py @@ -1,3 +1,9 @@ +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() d = None;d = dir() from .cython_compile import cython_compile, cython_import, cython_compile_autodeclare, is_compiled diff --git a/wetb/utils/cython_compile/cython_compile.py b/wetb/utils/cython_compile/cython_compile.py index 41ccc88..02213ae 100644 --- a/wetb/utils/cython_compile/cython_compile.py +++ b/wetb/utils/cython_compile/cython_compile.py @@ -7,6 +7,16 @@ Created on 10/07/2013 Wrapper functions and decorators for compiling functions using Cython ''' +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division +from __future__ import absolute_import +from builtins import dict +from builtins import open +from builtins import zip +from builtins import str +from future import standard_library +standard_library.install_aliases() import inspect import os import re diff --git a/wetb/utils/cython_compile/examples/cycheck.py b/wetb/utils/cython_compile/examples/cycheck.py index b3979a9..602cbf3 100644 --- a/wetb/utils/cython_compile/examples/cycheck.py +++ b/wetb/utils/cython_compile/examples/cycheck.py @@ -3,6 +3,14 @@ Created on 29/03/2013 @author: Mads ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from builtins import range +from builtins import int +from future import standard_library +standard_library.install_aliases() import cython import math diff --git a/wetb/utils/cython_compile/examples/examples.py b/wetb/utils/cython_compile/examples/examples.py index 037482d..14f794f 100644 --- a/wetb/utils/cython_compile/examples/examples.py +++ b/wetb/utils/cython_compile/examples/examples.py @@ -3,6 +3,14 @@ Created on 11/07/2013 @author: Mads M. Pedersen (mmpe@dtu.dk) ''' +from __future__ import print_function +from __future__ import unicode_literals +from __future__ import division +from __future__ import absolute_import +from builtins import range +from builtins import int +from future import standard_library +standard_library.install_aliases() import math from wetb.utils.cython_compile.cython_compile import cython_compile, \ diff --git a/wetb/utils/geometry.py b/wetb/utils/geometry.py index 586ad40..01a4daf 100644 --- a/wetb/utils/geometry.py +++ b/wetb/utils/geometry.py @@ -1,3 +1,10 @@ +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from builtins import map +from future import standard_library +standard_library.install_aliases() import numpy as np def rad(deg): diff --git a/wetb/utils/process_exec.py b/wetb/utils/process_exec.py index caeb497..04dfa69 100644 --- a/wetb/utils/process_exec.py +++ b/wetb/utils/process_exec.py @@ -3,6 +3,14 @@ Created on 10/03/2014 @author: MMPE ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from builtins import range +from builtins import str +from future import standard_library +standard_library.install_aliases() import os import psutil diff --git a/wetb/utils/tests/test_caching.py b/wetb/utils/tests/test_caching.py index d17dd92..5ffa33f 100644 --- a/wetb/utils/tests/test_caching.py +++ b/wetb/utils/tests/test_caching.py @@ -3,6 +3,12 @@ Created on 08/11/2013 @author: mmpe ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import multiprocessing import time import unittest diff --git a/wetb/utils/tests/test_geometry.py b/wetb/utils/tests/test_geometry.py index d5b0a2b..291864c 100644 --- a/wetb/utils/tests/test_geometry.py +++ b/wetb/utils/tests/test_geometry.py @@ -3,6 +3,12 @@ Created on 15/01/2014 @author: MMPE ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() import unittest import wetb.gtsdf diff --git a/wetb/utils/timing.py b/wetb/utils/timing.py index ab67d8b..7e148cb 100644 --- a/wetb/utils/timing.py +++ b/wetb/utils/timing.py @@ -1,3 +1,11 @@ +from __future__ import print_function +from __future__ import division +from __future__ import unicode_literals +from __future__ import absolute_import +from builtins import dict +from builtins import zip +from future import standard_library +standard_library.install_aliases() from six import exec_ import time import inspect diff --git a/wetb/wind/shear.py b/wetb/wind/shear.py index fb832a2..77e7013 100644 --- a/wetb/wind/shear.py +++ b/wetb/wind/shear.py @@ -3,6 +3,12 @@ Created on 16/06/2014 @author: MMPE ''' +from __future__ import division +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import absolute_import +from future import standard_library +standard_library.install_aliases() from scipy.optimize.optimize import fmin import numpy as np diff --git a/wetb/wind/tests/test_Shear.py b/wetb/wind/tests/test_Shear.py index 981d4ac..af1f6f0 100644 --- a/wetb/wind/tests/test_Shear.py +++ b/wetb/wind/tests/test_Shear.py @@ -3,6 +3,13 @@ Created on 05/06/2012 @author: Mads ''' +from __future__ import unicode_literals +from __future__ import print_function +from __future__ import division +from __future__ import absolute_import +from builtins import zip +from future import standard_library +standard_library.install_aliases() import os from wetb.utils.geometry import xyz2uvw import wetb.gtsdf -- GitLab