diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-05-26 15:16:14 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-05-26 15:16:14 +0200 |
| commit | 91977939eb7add4c503795a1e0b3fe6938b07404 (patch) | |
| tree | 9b7b3b8492f40db759a11254a03fe3cd4766d846 /python/astra/optomo.py | |
| parent | f5c3a7c07d834eabc4abb78834c952bbfcf0c906 (diff) | |
| parent | aed157812c31df681a7ba7dd4479cb35fbce05bb (diff) | |
| download | astra-91977939eb7add4c503795a1e0b3fe6938b07404.tar.gz astra-91977939eb7add4c503795a1e0b3fe6938b07404.tar.bz2 astra-91977939eb7add4c503795a1e0b3fe6938b07404.tar.xz astra-91977939eb7add4c503795a1e0b3fe6938b07404.zip | |
Merge pull request #66 from dmpelt/fix-old-six
Fix range import for old six versions
Diffstat (limited to 'python/astra/optomo.py')
| -rw-r--r-- | python/astra/optomo.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/python/astra/optomo.py b/python/astra/optomo.py index 0c37353..2937d9c 100644 --- a/python/astra/optomo.py +++ b/python/astra/optomo.py @@ -32,7 +32,13 @@ from . import creators from . import algorithm from . import functions import numpy as np -from six.moves import range, reduce +from six.moves import reduce +try: + from six.moves import range +except ImportError: + # six 1.3.0 + from six.moves import xrange as range + import operator import scipy.sparse.linalg |