Merge branch 'develop'

This commit is contained in:
hugovk 2017-02-13 20:32:09 +02:00
commit 506a911c57
2 changed files with 3 additions and 1 deletions

View file

@ -51,6 +51,7 @@ def _can_use_ssl_securely():
v = sys.version_info
return v > (3, 3) or ((2, 7, 9) < v < (3, 0))
if _can_use_ssl_securely():
import ssl

View file

@ -2172,7 +2172,8 @@ class TestPyLast(unittest.TestCase):
msg = str(exc)
# Assert
self.assertEqual(msg, "Invalid authentication token supplied")
self.assertEqual(msg,
"Unauthorized Token - This token has not been issued")
@flaky(max_runs=5, min_passes=1)