158c158
< raise TypeError, 'too many arguments'
---
> raise TypeError('too many arguments')
171c171
< raise TypeError, 'extra unknown kwargs %s' % kwargs
---
> raise TypeError('extra unknown kwargs %s' % kwargs)
174c174
< raise TypeError, 'desc attribute missing'
---
> raise TypeError('desc attribute missing')
183,184c183,184
< raise AttributeError, "'%s' object has no attribute '%s'" % \
< (type(self).__name__, attr)
---
> raise AttributeError("'%s' object has no attribute '%s'" % \
> (type(self).__name__, attr))
237,238c237,238
< raise AttributeError, \
< "Not allowed to set %s on '%s'" % (attr, type(self).__name__)
---
> raise AttributeError("Not allowed to set %s on '%s'" % \
> (attr, type(self).__name__))
542,543c542,543
< raise TypeError, 'Integer param out of bounds %d < %d < %d' % \
< (self.min, self.value, self.max)
---
> raise TypeError('Integer param out of bounds %d < %d < %d' % \
> (self.min, self.value, self.max))
551,552c551,552
< raise TypeError, "Can't convert object of type %s to CheckedInt" \
< % type(value).__name__
---
> raise TypeError("Can't convert object of type %s to CheckedInt" \
> % type(value).__name__)
617,618c617,618
< raise TypeError, "Can't convert object of type %s to Float" \
< % type(value).__name__
---
> raise TypeError("Can't convert object of type %s to Float" \
> % type(value).__name__)
714c714
< raise TypeError, "Either end or size must be specified"
---
> raise TypeError("Either end or size must be specified")
745c745
< raise TypeError, "Too many arguments specified"
---
> raise TypeError("Too many arguments specified")
748c748
< raise TypeError, "Too many keywords: %s" % kwargs.keys()
---
> raise TypeError("Too many keywords: %s" % list(kwargs.keys()))
888c888
< raise TypeError, "expected an ethernet address and didn't get one"
---
> raise TypeError("expected an ethernet address and didn't get one")
892c892
< raise TypeError, 'invalid ethernet address %s' % value
---
> raise TypeError('invalid ethernet address %s' % value)
896c896
< raise TypeError, 'invalid ethernet address %s' % value
---
> raise TypeError('invalid ethernet address %s' % value)
969c969
< raise TypeError, "invalid ip address %#08x" % self.ip
---
> raise TypeError("invalid ip address %#08x" % self.ip)
994c994
< raise TypeError, "No value set for %s" % key
---
> raise TypeError("No value set for %s" % key)
1003c1003
< raise TypeError, "Invalid arguments"
---
> raise TypeError("Invalid arguments")
1016c1016
< raise TypeError, "Too many arguments specified"
---
> raise TypeError("Too many arguments specified")
1019c1019
< raise TypeError, "Too many keywords: %s" % kwargs.keys()
---
> raise TypeError("Too many keywords: %s" % list(kwargs.keys()))
1044c1044
< raise TypeError, "invalid netmask %d" % netmask
---
> raise TypeError("invalid netmask %d" % netmask)
1068c1068
< raise TypeError, "No value set for %s" % key
---
> raise TypeError("No value set for %s" % key)
1077c1077
< raise TypeError, "Invalid arguments"
---
> raise TypeError("Invalid arguments")
1090c1090
< raise TypeError, "Too many arguments specified"
---
> raise TypeError("Too many arguments specified")
1093c1093
< raise TypeError, "Too many keywords: %s" % kwargs.keys()
---
> raise TypeError("Too many keywords: %s" % list(kwargs.keys()))
1118c1118
< raise TypeError, "invalid port %d" % self.port
---
> raise TypeError("invalid port %d" % self.port)
1160c1160
< raise ValueError, "Could not parse '%s' as a time" % value
---
> raise ValueError("Could not parse '%s' as a time" % value)
1229,1230c1229,1230
< raise TypeError, "Enum-derived class attribute 'map' " \
< "must be of type dict"
---
> raise TypeError("Enum-derived class attribute 'map' " \
> "must be of type dict")
1236,1237c1236,1237
< raise TypeError, "Enum-derived class attribute 'vals' " \
< "must be of type list"
---
> raise TypeError("Enum-derived class attribute 'vals' " \
> "must be of type list")
1243,1244c1243,1244
< raise TypeError, "Enum-derived class must define "\
< "attribute 'map' or 'vals'"
---
> raise TypeError("Enum-derived class must define "\
> "attribute 'map' or 'vals'")
1388,1389c1388,1389
< raise TypeError, "Enum param got bad value '%s' (not in %s)" \
< % (value, self.vals)
---
> raise TypeError("Enum param got bad value '%s' (not in %s)" \
> % (value, self.vals))
1494c1494
< raise AttributeError, "Latency object has no attribute '%s'" % attr
---
> raise AttributeError("Latency object has no attribute '%s'" % attr)
1536c1536
< raise AttributeError, "Frequency object has no attribute '%s'" % attr
---
> raise AttributeError("Frequency object has no attribute '%s'" % attr)
1581c1581
< raise AttributeError, "Frequency object has no attribute '%s'" % attr
---
> raise AttributeError("Frequency object has no attribute '%s'" % attr)
1803,1804c1803,1804
< raise AttributeError, "'%s' object has no attribute '%s'" % \
< (self.__class__.__name__, attr)
---
> raise AttributeError("'%s' object has no attribute '%s'" % \
> (self.__class__.__name__, attr))
1824,1826c1824,1825
< raise TypeError, \
< "assigning non-port reference '%s' to port '%s'" \
< % (other, self)
---
> raise TypeError("assigning non-port reference '%s' to port '%s'" \
> % (other, self))
1839c1838
< raise TypeError, \
---
> raise TypeError(
1841c1840
< (new_master_peer, new_slave_peer, self)
---
> (new_master_peer, new_slave_peer, self))
1895,1897c1894,1896
< raise TypeError, \
< "cannot connect '%s' and '%s' due to identical role '%s'" \
< % (peer, self, self.role)
---
> raise TypeError(
> "cannot connect '%s' and '%s' due to identical role '%s'" % \
> (peer, self, self.role))
1954c1953
< raise TypeError, "VectorPort index must be integer"
---
> raise TypeError("VectorPort index must be integer")
1967c1966
< raise TypeError, "VectorPort index must be integer"
---
> raise TypeError("VectorPort index must be integer")
2032c2031
< raise TypeError, 'wrong number of arguments'
---
> raise TypeError('wrong number of arguments')
2041c2040
< raise TypeError, 'wrong number of arguments'
---
> raise TypeError('wrong number of arguments')
2060c2059
< raise TypeError, 'wrong number of arguments'
---
> raise TypeError('wrong number of arguments')
2070c2069
< raise TypeError, 'wrong number of arguments'
---
> raise TypeError('wrong number of arguments')