diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-05-29 13:15:47 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-05-29 13:15:47 +0200 |
| commit | 9f86a4c3f20ac8785f80288ec4cdefe79ed67e68 (patch) | |
| tree | de8153fb6481096f21bc0056d552571662df0071 /python/astra/matrix_c.pyx | |
| parent | 0f314f9fb219157ed3988ee08e0a8132301105ff (diff) | |
| parent | 7a4cfe2e5fe384691f0516020b2fcd48b35a7f63 (diff) | |
| download | astra-9f86a4c3f20ac8785f80288ec4cdefe79ed67e68.tar.gz astra-9f86a4c3f20ac8785f80288ec4cdefe79ed67e68.tar.bz2 astra-9f86a4c3f20ac8785f80288ec4cdefe79ed67e68.tar.xz astra-9f86a4c3f20ac8785f80288ec4cdefe79ed67e68.zip | |
Merge branch 'master'
Diffstat (limited to 'python/astra/matrix_c.pyx')
| -rw-r--r-- | python/astra/matrix_c.pyx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/python/astra/matrix_c.pyx b/python/astra/matrix_c.pyx index b0d8bc4..d099a75 100644 --- a/python/astra/matrix_c.pyx +++ b/python/astra/matrix_c.pyx @@ -27,7 +27,12 @@ # distutils: libraries = astra import six -from six.moves import range +try: + from six.moves import range +except ImportError: + # six 1.3.0 + from six.moves import xrange as range + import numpy as np import scipy.sparse as ss |