From 0d7313c01193b00ce3d65c4b54e6a3c6633de7ad Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Tue, 11 Nov 2014 16:54:54 +0100 Subject: Fixup for 5c9aa9af: Actually convert to str for unicode hostnames. --- service/pixelated/bitmask_libraries/certs.py | 2 +- service/test/unit/bitmask_libraries/certs_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'service') diff --git a/service/pixelated/bitmask_libraries/certs.py b/service/pixelated/bitmask_libraries/certs.py index b030af76..caa166e2 100644 --- a/service/pixelated/bitmask_libraries/certs.py +++ b/service/pixelated/bitmask_libraries/certs.py @@ -21,7 +21,7 @@ from .config import AUTO_DETECT_CA_BUNDLE def which_bundle(provider): - return LeapCertificate(provider).auto_detect_ca_bundle() + return str(LeapCertificate(provider).auto_detect_ca_bundle()) class LeapCertificate(object): diff --git a/service/test/unit/bitmask_libraries/certs_test.py b/service/test/unit/bitmask_libraries/certs_test.py index 405cc4db..8caafe7e 100644 --- a/service/test/unit/bitmask_libraries/certs_test.py +++ b/service/test/unit/bitmask_libraries/certs_test.py @@ -11,7 +11,7 @@ class CertsTest(unittest.TestCase): def test_that_which_bundle_returns_byte_string(self, mock_isfile): mock_isfile.return_value = True config = MagicMock(ca_cert_bundle=AUTO_DETECT_CA_BUNDLE, certs_home='/some/path') - provider = MagicMock(server_name='test.leap.net', config=config) + provider = MagicMock(server_name=u'test.leap.net', config=config) bundle = which_bundle(provider) -- cgit v1.2.3