diff --git a/salt/crypt.py b/salt/crypt.py index 6c0401ff01..6be93d519c 100644 --- a/salt/crypt.py +++ b/salt/crypt.py @@ -393,7 +393,7 @@ class Auth(object): syndic_finger = self.opts.get('syndic_finger', self.opts.get('master_finger', False)) if syndic_finger: if salt.utils.pem_finger(m_pub_fn) != syndic_finger: - _finger_fail(syndic_finger, m_pub_fn) + self._finger_fail(syndic_finger, m_pub_fn) else: if self.opts.get('master_finger', False): if salt.utils.pem_finger(m_pub_fn) != self.opts['master_finger']: @@ -401,7 +401,7 @@ class Auth(object): auth['publish_port'] = payload['publish_port'] return auth - def _finger_fail(finger, master_key): + def _finger_fail(self, finger, master_key): log.critical( 'The specified fingerprint in the master configuration ' 'file:\n{0}\nDoes not match the authenticating master\'s ' diff --git a/salt/utils/odict.py b/salt/utils/odict.py index 1dfeb50e1b..198cc85f0b 100644 --- a/salt/utils/odict.py +++ b/salt/utils/odict.py @@ -329,7 +329,8 @@ class DefaultOrderedDict(OrderedDict): import copy return type(self)(self.default_factory, copy.deepcopy(self.items())) - def __repr__(self): + + def __repr__(self, _repr_running={}): # pylint: disable=W0102 return 'DefaultOrderedDict(%s, %s)' % (self.default_factory, - super(DefaultOrderedDict, + super(DefaultOrderedDict, self).__repr__())