Fix crash and comment.

theano/compile/ops.py

@@ -217,7 +217,8 @@ class Shape(gof.Op):
     def make_node(self, x):
         # Must work for all type that have a shape attribute.
         # This will fail at execution time.
-
+        if not isinstance(x, theano.Variable):
+            x = theano.tensor.as_tensor_variable(x)
         return gof.Apply(self, [x], [theano.tensor.lvector()])
 
     def perform(self, node, inp, out_):

theano/sandbox/gpuarray/type.py

@@ -298,7 +298,7 @@ theano.compile.register_view_op_c_code(GpuArrayType, """
     Py_XINCREF(%(oname)s);
 """, version=(0,))
 
-# Register TensorType C code for Shape Op.
+# Register GpuArrayType C code for Shape Op.
 theano.compile.register_shape_c_code(
     GpuArrayType,
     """