fix things that were either screwed up by the rebase, or were new code

theano/tensor/extra_ops.py

@@ -262,8 +262,8 @@ class RepeatOp(theano.Op):
             broadcastable=[False]
         else:
             try:
-                const_reps = basic.get_constant_value(repeats)
-            except basic.NotConstantError:
+                const_reps = basic.get_scalar_constant_value(repeats)
+            except basic.NotScalarConstantError:
                 const_reps = None
             if const_reps == 1:
                 broadcastable = x.broadcastable

theano/tensor/nnet/nnet.py

@@ -1410,7 +1410,7 @@ def _check_rows_is_arange_len_labels(rows, labels):
 def _is_const(z, val, approx=False):
     try:
         maybe = opt.get_scalar_constant_value(z)
-    except TypeError:
+    except tensor.NotScalarConstantError:
         return False
     if approx:
         return numpy.allclose(maybe, val)