diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-12-14 14:19:33 +0100 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-12-14 14:19:33 +0100 |
commit | 0dbdc0096dacc1f6233600ed6e36487bbab6b718 (patch) | |
tree | 19d82f5420acc2a4efc06d2c58e156e79dc29bd5 /pyspike/PieceWiseLinFunc.py | |
parent | 691bf73c06322a2c47c37a5c48d085b789c8e8bf (diff) | |
parent | 8baf994af3c5c8f7c76ca5a2c06e5220ba33604f (diff) |
Merge pull request #19 from ignatenkobrain/py3_develop
Python 3 support
Diffstat (limited to 'pyspike/PieceWiseLinFunc.py')
-rw-r--r-- | pyspike/PieceWiseLinFunc.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pyspike/PieceWiseLinFunc.py b/pyspike/PieceWiseLinFunc.py index 0d51c76..8145e63 100644 --- a/pyspike/PieceWiseLinFunc.py +++ b/pyspike/PieceWiseLinFunc.py @@ -2,7 +2,7 @@ # Copyright 2014-2015, Mario Mulansky <mario.mulansky@gmx.net> # Distributed under the BSD License -from __future__ import print_function +from __future__ import absolute_import, print_function import numpy as np import collections @@ -222,13 +222,13 @@ class PieceWiseLinFunc: assert self.x[-1] == f.x[-1], "The functions have different intervals" # python implementation - # from python_backend import add_piece_wise_lin_python + # from .python_backend import add_piece_wise_lin_python # self.x, self.y1, self.y2 = add_piece_wise_lin_python( # self.x, self.y1, self.y2, f.x, f.y1, f.y2) # cython version try: - from cython.cython_add import add_piece_wise_lin_cython as \ + from .cython.cython_add import add_piece_wise_lin_cython as \ add_piece_wise_lin_impl except ImportError: if not(pyspike.disable_backend_warning): @@ -237,7 +237,7 @@ sure that PySpike is installed by running\n \ 'python setup.py build_ext --inplace'! \n \ Falling back to slow python backend.") # use python backend - from cython.python_backend import add_piece_wise_lin_python as \ + from .cython.python_backend import add_piece_wise_lin_python as \ add_piece_wise_lin_impl self.x, self.y1, self.y2 = add_piece_wise_lin_impl( |