open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add simpler exception message, assert that it is being used

Browse Source
This commit is contained in:
Chris Wolfe 2016-06-02 14:21:29 -07:00
parent 5be436b81d
commit bc7dea8bab
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wormhole/test/test_wormhole.py
View File

@ -826,9 +826,12 @@ class Wormholes(ServerBase, unittest.TestCase):
code = yield w1.get_code() code = yield w1.get_code()
code_no_dashes = code.replace('-', ' ') code_no_dashes = code.replace('-', ' ')
with self.assertRaises(KeyFormatError): with self.assertRaises(KeyFormatError) as ex:
w2.set_code(code_no_dashes) w2.set_code(code_no_dashes)
expected_msg = "code (%s) contains spaces." % (code_no_dashes,)
self.assertEqual(expected_msg, str(ex.exception))
yield w1.close() yield w1.close()
yield w2.close() yield w2.close()
self.flushLoggedErrors(ValueError) self.flushLoggedErrors(ValueError)

5
src/wormhole/wormhole.py
View File

@ -479,10 +479,7 @@ class _Wormhole:
# bail out early if the password contains spaces... # bail out early if the password contains spaces...
# this should raise a useful error # this should raise a useful error
if ' ' in code: if ' ' in code:
raise KeyFormatError( raise KeyFormatError("code (%s) contains spaces." % code)
"code (%s) contains spaces. Words must be separated by dashes"
% code
)
self._code = code self._code = code
mo = re.search(r'^(\d+)-', code) mo = re.search(r'^(\d+)-', code)
if not mo: if not mo: