Fix H501 errors
This rule has been updated in hacking v0.10.0 to prevent usage of self.__dict__ in formatting operations. Since global requirements require >= v0.10.2 of hacking for Liberty, ec2api has to follow this extended rule. Change-Id: I9110ed47a9a38fe351c74db27bd6b4bbb8389da4
This commit is contained in:
Feodor Tersin
parent
c06d97d712
commit
7fa6d16f06
|
|
@ -30,7 +30,8 @@ class DictKeysMismatch(object):
|
|||
|
||||
def describe(self):
|
||||
return ('Keys in d1 and not d2: %(d1only)s.'
|
||||
' Keys in d2 and not d1: %(d2only)s' % self.__dict__)
|
||||
' Keys in d2 and not d1: %(d2only)s' %
|
||||
{'d1only': self.d1only, 'd2only': self.d2only})
|
||||
|
||||
def get_details(self):
|
||||
return {}
|
||||
|
|
@ -43,8 +44,8 @@ class ValueMismatch(object):
|
|||
self.v2 = v2
|
||||
|
||||
def describe(self):
|
||||
return ("Values do not match."
|
||||
" v1: %(v1)s v2: %(v2)s" % self.__dict__)
|
||||
return ("Values do not match. v1: %(v1)s v2: %(v2)s" %
|
||||
{'v1': self.v1, 'v2': self.v2})
|
||||
|
||||
def get_details(self):
|
||||
return {}
|
||||
|
|
@ -59,7 +60,9 @@ class DictMismatch(object):
|
|||
|
||||
def describe(self):
|
||||
return ("Dictionaries do not match at %(key)s."
|
||||
" d1: %(d1_value)s d2: %(d2_value)s" % self.__dict__)
|
||||
" d1: %(d1_value)s d2: %(d2_value)s" %
|
||||
{'key': self.key, 'd1_value': self.d1_value,
|
||||
'd2_value': self.d2_value})
|
||||
|
||||
def get_details(self):
|
||||
return {}
|
||||
|
|
@ -169,8 +172,8 @@ class ListMismatch(object):
|
|||
self.l2 = l2
|
||||
|
||||
def describe(self):
|
||||
return ('Lists mismatch: L1=%(l1)s != '
|
||||
'L2=%(l2)s' % self.__dict__)
|
||||
return ('Lists mismatch: L1=%(l1)s != L2=%(l2)s' %
|
||||
{'l1': self.l1, 'l2': self.l2})
|
||||
|
||||
def get_details(self):
|
||||
return {}
|
||||
|
|
@ -183,8 +186,8 @@ class ListLengthMismatch(object):
|
|||
self.l2 = l2
|
||||
|
||||
def describe(self):
|
||||
return ('Lists lengths mismatch: L1=%(l1)s != '
|
||||
'L2=%(l2)s' % self.__dict__)
|
||||
return ('Lists lengths mismatch: L1=%(l1)s != L2=%(l2)s' %
|
||||
{'l1': self.l1, 'l2': self.l2})
|
||||
|
||||
def get_details(self):
|
||||
return {}
|
||||
|
|
@ -301,7 +304,7 @@ class XMLMismatch(object):
|
|||
self.actual = state.actual
|
||||
|
||||
def describe(self):
|
||||
return "%(path)s: XML does not match" % self.__dict__
|
||||
return "%(path)s: XML does not match" % {'path': self.path}
|
||||
|
||||
def get_details(self):
|
||||
return {
|
||||
|
|
@ -323,7 +326,10 @@ class XMLTagMismatch(XMLMismatch):
|
|||
def describe(self):
|
||||
return ("%(path)s: XML tag mismatch at index %(idx)d: "
|
||||
"expected tag <%(expected_tag)s>; "
|
||||
"actual tag <%(actual_tag)s>" % self.__dict__)
|
||||
"actual tag <%(actual_tag)s>" %
|
||||
{'path': self.path, 'idx': self.idx,
|
||||
'expected_tag': self.expected_tag,
|
||||
'actual_tag': self.actual_tag})
|
||||
|
||||
|
||||
class XMLAttrKeysMismatch(XMLMismatch):
|
||||
|
|
@ -338,7 +344,9 @@ class XMLAttrKeysMismatch(XMLMismatch):
|
|||
def describe(self):
|
||||
return ("%(path)s: XML attributes mismatch: "
|
||||
"keys only in expected: %(expected_only)s; "
|
||||
"keys only in actual: %(actual_only)s" % self.__dict__)
|
||||
"keys only in actual: %(actual_only)s" %
|
||||
{'path': self.path, 'expected_only': self.expected_only,
|
||||
'actual_only': self.actual_only})
|
||||
|
||||
|
||||
class XMLAttrValueMismatch(XMLMismatch):
|
||||
|
|
@ -354,7 +362,10 @@ class XMLAttrValueMismatch(XMLMismatch):
|
|||
def describe(self):
|
||||
return ("%(path)s: XML attribute value mismatch: "
|
||||
"expected value of attribute %(key)s: %(expected_value)r; "
|
||||
"actual value: %(actual_value)r" % self.__dict__)
|
||||
"actual value: %(actual_value)r" %
|
||||
{'path': self.path, 'key': self.key,
|
||||
'expected_value': self.expected_value,
|
||||
'actual_value': self.actual_value})
|
||||
|
||||
|
||||
class XMLTextValueMismatch(XMLMismatch):
|
||||
|
|
@ -369,7 +380,9 @@ class XMLTextValueMismatch(XMLMismatch):
|
|||
def describe(self):
|
||||
return ("%(path)s: XML text value mismatch: "
|
||||
"expected text value: %(expected_text)r; "
|
||||
"actual value: %(actual_text)r" % self.__dict__)
|
||||
"actual value: %(actual_text)r" %
|
||||
{'path': self.path, 'expected_text': self.expected_text,
|
||||
'actual_text': self.actual_text})
|
||||
|
||||
|
||||
class XMLUnexpectedChild(XMLMismatch):
|
||||
|
|
@ -383,7 +396,8 @@ class XMLUnexpectedChild(XMLMismatch):
|
|||
|
||||
def describe(self):
|
||||
return ("%(path)s: XML unexpected child element <%(tag)s> "
|
||||
"present at index %(idx)d" % self.__dict__)
|
||||
"present at index %(idx)d" %
|
||||
{'path': self.path, 'tag': self.tag, 'idx': self.idx})
|
||||
|
||||
|
||||
class XMLExpectedChild(XMLMismatch):
|
||||
|
|
@ -397,7 +411,8 @@ class XMLExpectedChild(XMLMismatch):
|
|||
|
||||
def describe(self):
|
||||
return ("%(path)s: XML expected child element <%(tag)s> "
|
||||
"not present at index %(idx)d" % self.__dict__)
|
||||
"not present at index %(idx)d" %
|
||||
{'path': self.path, 'tag': self.tag, 'idx': self.idx})
|
||||
|
||||
|
||||
class XMLMatchState(object):
|
||||
|
|
|
|||
|
|
@ -131,7 +131,8 @@ class Server(object):
|
|||
raise
|
||||
|
||||
(self.host, self.port) = self._socket.getsockname()[0:2]
|
||||
LOG.info(_("%(name)s listening on %(host)s:%(port)s") % self.__dict__)
|
||||
LOG.info(_("%(name)s listening on %(host)s:%(port)s"),
|
||||
{'name': self.name, 'host': self.host, 'port': self.port})
|
||||
|
||||
def start(self):
|
||||
"""Start serving a WSGI application.
|
||||
|
|
@ -195,7 +196,9 @@ class Server(object):
|
|||
except Exception:
|
||||
with excutils.save_and_reraise_exception():
|
||||
LOG.error(_("Failed to start %(name)s on %(host)s"
|
||||
":%(port)s with SSL support") % self.__dict__)
|
||||
":%(port)s with SSL support"),
|
||||
{'name': self.name, 'host': self.host,
|
||||
'port': self.port})
|
||||
|
||||
wsgi_kwargs = {
|
||||
'func': eventlet.wsgi.server,
|
||||
|
|
|
|||
Loading…
Reference in New Issue