clean up.

theano/scalar/basic.py

@@ -3478,7 +3478,7 @@ class Composite(ScalarOp):
         if name:
             out.name = name
         else:
-            name = getattr(out, 'name', None)
+            name = out.name
         super(Composite, out).__init__(output_types_preference, name)
         return out
 
@@ -3561,23 +3561,8 @@ class Composite(ScalarOp):
         Return a readable string representation of self.fgraph.
 
         """
-        try:
         rval = self.name
         if rval is None:
-                raise AttributeError
-        except AttributeError:
-            if 0:
-                l = []
-                for n in self.fgraph.toposort():
-                    if hasattr(n.op, "name") and n.op.name is not None:
-                        v = n.op.name
-                        if v.startswith("Composite"):
-                            v = v[len("Composite"):]
-                    else:
-                        v = n.op.__class__.__name__
-                    l.append(v)
-                rval = "Composite{" + ",".join(l) + "}"
-            else:
             for i, r in enumerate(self.fgraph.inputs):
                 r.name = 'i%i' % i
             for i, r in enumerate(self.fgraph.outputs):