fix import due to restructuring.

theano/tensor/basic.py

@@ -28,7 +28,6 @@ from theano import compile, printing
 from theano.printing import pprint, min_informative_str
 
 # We use these exceptions as well.
-from theano.scalar import ComplexError, IntegerDivisionError
 import theano.scalar.sharedvar
 from theano.gradient import grad_undefined
 from theano.gradient import grad_not_implemented

theano/tensor/tests/test_basic.py

@@ -38,7 +38,7 @@ from theano.tensor import (_shared, wvector, bvector, autocast_float_as,
         var, Join, shape, MaxAndArgmax, lscalar, zvector, exp,
         get_scalar_constant_value, ivector, reshape, scalar_from_tensor, scal,
         iscalars, arange, dscalars, fvector, imatrix, numeric_grad,
-        opt, ComplexError, lvector, lmatrix, true_div, max, min, Split, roll,
+        opt, lvector, lmatrix, true_div, max, min, Split, roll,
         tile, patternbroadcast, Eye, Shape, Dot, PermuteRowElements,
         ScalarFromTensor, TensorFromScalar, dtensor4, Rebroadcast, Alloc,
         dtensor3, SpecifyShape, Mean,
@@ -5750,7 +5750,7 @@ class test_complex_mod(unittest.TestCase):
         try:
             x % 5
             assert False
-        except ComplexError:
+        except theano.scalar.ComplexError:
             pass
 
 

theano/tensor/var.py

@@ -2,6 +2,7 @@ import numpy
 
 import theano
 from theano.compat import PY3
+from theano.scalar import ComplexError, IntegerDivisionError
 from theano.gof import Constant, Variable
 from theano.gof.utils import hashtype
 from theano.tensor.utils import hash_from_ndarray