DOC/TST: fix various doctest failures

Author: kohr-h

odl/solvers/util/callback.py

@@ -173,7 +173,7 @@ def __repr__(self):
         >>> callback = odl.solvers.CallbackPrint()
         >>> operator = odl.ScalingOperator(r3, 2.0)
         >>> callback * operator
-        CallbackPrint() * ScalingOperator(rn(3), 2.0)
+        CallbackPrint() * ScalingOperator(rn(3), scalar=2.0)
         """
         return '{!r} * {!r}'.format(self.callback, self.operator)
 

odl/tomo/geometry/conebeam.py

@@ -533,10 +533,7 @@ def __getitem__(self, indices):
 
         >>> geom[::2, :]
         FanFlatGeometry(
-            nonuniform_partition(
-                [ 0.5,  2.5],
-                min_pt=0.0, max_pt=4.0
-            ),
+            nonuniform_partition([ 0.5,  2.5], min_pt=0.0, max_pt=4.0),
             uniform_partition(-1.0, 1.0, 20),
             src_radius=50.0,
             det_radius=100.0
@@ -1183,10 +1180,7 @@ def __getitem__(self, indices):
 
         >>> geom[::2]
         ConeFlatGeometry(
-            nonuniform_partition(
-                [ 0.5,  2.5],
-                min_pt=0.0, max_pt=4.0
-            ),
+            nonuniform_partition([ 0.5,  2.5], min_pt=0.0, max_pt=4.0),
             uniform_partition([-1., -1.], [ 1.,  1.], (20, 20)),
             src_radius=50.0,
             det_radius=100.0,

odl/tomo/geometry/parallel.py

@@ -682,10 +682,7 @@ def __getitem__(self, indices):
 
         >>> geom[::2]
         Parallel2dGeometry(
-            nonuniform_partition(
-                [ 0.5,  2.5],
-                min_pt=0.0, max_pt=4.0
-            ),
+            nonuniform_partition([ 0.5,  2.5], min_pt=0.0, max_pt=4.0),
             uniform_partition(-1.0, 1.0, 20)
         )
         """
@@ -1446,10 +1443,7 @@ def __getitem__(self, indices):
 
         >>> geom[::2]
         Parallel3dAxisGeometry(
-            nonuniform_partition(
-                [ 0.5,  2.5],
-                min_pt=0.0, max_pt=4.0
-            ),
+            nonuniform_partition([ 0.5,  2.5], min_pt=0.0, max_pt=4.0),
             uniform_partition([-1., -1.], [ 1.,  1.], (20, 20))
         )
         """