make default mood "happy", change other mood names

This commit is contained in:
Brian Warner 2015-11-12 09:31:03 -08:00
parent cc369d6b1e
commit 2e393c145e

View File

@ -168,13 +168,13 @@ def close_on_error(f): # method decorator
self.close(u"lonely")
raise
except WrongPasswordError:
self.close(u"scared")
self.close(u"scary")
raise
except (TypeError, UsageError):
# preconditions don't warrant _close_with_error()
raise
except:
self.close(u"other-error")
self.close(u"errory")
raise
return _f
@ -341,7 +341,7 @@ class Wormhole:
except CryptoError:
raise WrongPasswordError
def close(self, mood=None):
def close(self, mood=u"happy"):
if not isinstance(mood, (type(None), type(u""))):
raise TypeError(type(mood))
self._closed = True