From 0f4969c3011910518639e3dd9ff6c1e4b2539f4c Mon Sep 17 00:00:00 2001
From: Daan Pelt <daan.pelt@gmail.com>
Date: Mon, 18 May 2015 20:32:52 +0200
Subject: Hold reference to results of six.b calls

---
 python/astra/log_c.pyx | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'python/astra')

diff --git a/python/astra/log_c.pyx b/python/astra/log_c.pyx
index 969cc06..f16329f 100644
--- a/python/astra/log_c.pyx
+++ b/python/astra/log_c.pyx
@@ -52,16 +52,20 @@ cdef extern from "astra/Logging.h" namespace "astra::CLogger":
     void setFormatScreen(const char *fmt)
 
 def log_debug(sfile, sline, message):
-    debug(six.b(sfile),sline,six.b(message))
+    cstr = list(map(six.b,(sfile,message)))
+    debug(cstr[0],sline,cstr[1])
 
 def log_info(sfile, sline, message):
-    info(six.b(sfile),sline,six.b(message))
+    cstr = list(map(six.b,(sfile,message)))
+    info(cstr[0],sline,cstr[1])
 
 def log_warn(sfile, sline, message):
-    warn(six.b(sfile),sline,six.b(message))
+    cstr = list(map(six.b,(sfile,message)))
+    warn(cstr[0],sline,cstr[1])
 
 def log_error(sfile, sline, message):
-    error(six.b(sfile),sline,six.b(message))
+    cstr = list(map(six.b,(sfile,message)))
+    error(cstr[0],sline,cstr[1])
 
 def log_enable():
     enable()
@@ -82,10 +86,12 @@ def log_disableFile():
     disableFile()
 
 def log_setFormatFile(fmt):
-    setFormatFile(six.b(fmt))
+    cstr = six.b(fmt)
+    setFormatFile(cstr)
 
 def log_setFormatScreen(fmt):
-    setFormatScreen(six.b(fmt))
+    cstr = six.b(fmt)
+    setFormatScreen(cstr)
 
 enumList = [LOG_DEBUG,LOG_INFO,LOG_WARN,LOG_ERROR]
 
@@ -93,4 +99,5 @@ def log_setOutputScreen(fd, level):
     setOutputScreen(fd, enumList[level])
 
 def log_setOutputFile(filename, level):
-    setOutputFile(six.b(filename), enumList[level])
\ No newline at end of file
+    cstr = six.b(filename)
+    setOutputFile(cstr, enumList[level])
-- 
cgit v1.2.3


From aed157812c31df681a7ba7dd4479cb35fbce05bb Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <D.M.Pelt@cwi.nl>
Date: Mon, 18 May 2015 20:54:54 +0200
Subject: Fix range import for old six versions

---
 python/astra/functions.py | 6 +++++-
 python/astra/matrix_c.pyx | 7 ++++++-
 python/astra/optomo.py    | 8 +++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'python/astra')

diff --git a/python/astra/functions.py b/python/astra/functions.py
index b826b86..e38b5bc 100644
--- a/python/astra/functions.py
+++ b/python/astra/functions.py
@@ -32,7 +32,11 @@
 
 from . import creators as ac
 import numpy as np
-from six.moves import range
+try:
+    from six.moves import range
+except ImportError:
+    # six 1.3.0
+    from six.moves import xrange as range
 
 from . import data2d
 from . import data3d
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
 
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
 
-- 
cgit v1.2.3


From 0f577d1fbc2b0c15d85f18cc38eb14e3cbf6c6a2 Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <D.M.Pelt@cwi.nl>
Date: Fri, 22 May 2015 14:36:42 +0200
Subject: Fix optomo reconstruction for 1D input

---
 python/astra/optomo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python/astra')

diff --git a/python/astra/optomo.py b/python/astra/optomo.py
index 2937d9c..0108674 100644
--- a/python/astra/optomo.py
+++ b/python/astra/optomo.py
@@ -164,7 +164,7 @@ class OpTomo(scipy.sparse.linalg.LinearOperator):
         :param extraOptions: Extra options to use during reconstruction (i.e. for cfg['option']).
         :type extraOptions: :class:`dict`
         """
-        self.__checkArray(s, self.sshape)
+        s = self.__checkArray(s, self.sshape)
         sid = self.data_mod.link('-sino',self.pg,s)
         v = np.zeros(self.vshape,dtype=np.float32)
         vid = self.data_mod.link('-vol',self.vg,v)
-- 
cgit v1.2.3