diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
| commit | ad29154d8c152996d16c012dcc5798c5f1957aed (patch) | |
| tree | f01575082a649061362178d4a9870cb5fe2c33f6 /pyspike/PieceWiseConstFunc.py | |
| parent | 1fa8493ce15af8cd4c057eece155f1557fc241ea (diff) | |
| parent | c17cc8602414cec883c412008a4300b2c7ac7f80 (diff) | |
Merge branch 'master' into new_directionality
Conflicts:
pyspike/__init__.py
pyspike/cython/cython_directionality.pyx
pyspike/cython/directionality_python_backend.py
pyspike/spike_directionality.py
setup.py
Diffstat (limited to 'pyspike/PieceWiseConstFunc.py')
| -rw-r--r-- | pyspike/PieceWiseConstFunc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pyspike/PieceWiseConstFunc.py b/pyspike/PieceWiseConstFunc.py index 23ff536..5ce5f27 100644 --- a/pyspike/PieceWiseConstFunc.py +++ b/pyspike/PieceWiseConstFunc.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 @@ -189,7 +189,7 @@ class PieceWiseConstFunc(object): # cython version try: - from cython.cython_add import add_piece_wise_const_cython as \ + from .cython.cython_add import add_piece_wise_const_cython as \ add_piece_wise_const_impl except ImportError: if not(pyspike.disable_backend_warning): @@ -198,7 +198,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_const_python as \ + from .cython.python_backend import add_piece_wise_const_python as \ add_piece_wise_const_impl self.x, self.y = add_piece_wise_const_impl(self.x, self.y, f.x, f.y) |