486,487c486,487
< raise TypeError, \
< "SimObjects do not support multiple inheritance"
---
> raise TypeError(
> "SimObjects do not support multiple inheritance")
546,547c546,547
< raise TypeError, 'keyword %s has bad type %s (expecting %s)' % \
< (keyword, type(val), kwtype)
---
> raise TypeError('keyword %s has bad type %s (expecting %s)' % \
> (keyword, type(val), kwtype))
565c565
< except Exception, e:
---
> except Exception as e:
625c625
< raise RuntimeError, \
---
> raise RuntimeError(
628c628
< % (attr, cls.__name__)
---
> % (attr, cls.__name__))
642,643c642,643
< raise AttributeError, \
< "Class %s has no parameter \'%s\'" % (cls.__name__, attr)
---
> raise AttributeError(
> "Class %s has no parameter \'%s\'" % (cls.__name__, attr))
661,662c661,662
< raise AttributeError, \
< "object '%s' has no attribute '%s'" % (cls.__name__, attr)
---
> raise AttributeError(
> "object '%s' has no attribute '%s'" % (cls.__name__, attr))
1155c1155
< raise RuntimeError, "attempt to clone object %s " \
---
> raise RuntimeError("attempt to clone object %s " \
1157c1157
< % (self, self._parent)
---
> % (self, self._parent))
1199c1199
< raise AttributeError, err_string
---
> raise AttributeError(err_string)
1219c1219
< except Exception, e:
---
> except Exception as e:
1243,1244c1243,1244
< raise AttributeError, "Class %s has no parameter %s" \
< % (self.__class__.__name__, attr)
---
> raise AttributeError("Class %s has no parameter %s" \
> % (self.__class__.__name__, attr))
1252c1252
< raise IndexError, "Non-zero index '%s' to SimObject" % key
---
> raise IndexError("Non-zero index '%s' to SimObject" % key)
1355c1355
< raise AttributeError, \
---
> raise AttributeError(
1357c1357
< (found_obj.path, child.path)
---
> (found_obj.path, child.path))
1364c1364
< raise AttributeError, \
---
> raise AttributeError(
1366c1366
< (found_obj.path, match_obj.path)
---
> (found_obj.path, match_obj.path))
1536c1536
< raise RuntimeError, "Attempt to instantiate orphan node"
---
> raise RuntimeError("Attempt to instantiate orphan node")
1544,1545c1544,1545
< raise RuntimeError, "%s: Cycle found in configuration hierarchy." \
< % self.path()
---
> raise RuntimeError("%s: Cycle found in configuration hierarchy." \
> % self.path())
1653c1653
< raise TypeError, "SimObject or SimObjectVector expected"
---
> raise TypeError("SimObject or SimObjectVector expected")