python3: use open() to open files

This commit is contained in:
Frédéric Péters 2018-03-25 09:57:01 +02:00
parent 7ac7c48f67
commit d342971a45
6 changed files with 9 additions and 9 deletions

View File

@ -46,7 +46,7 @@ class DefaultAdapter(object):
idp['METADATA'] = response.content
elif 'METADATA' in idp:
if idp['METADATA'].startswith('/'):
idp['METADATA'] = file(idp['METADATA']).read()
idp['METADATA'] = open(idp['METADATA']).read()
else:
self.logger.error(u'missing METADATA or METADATA_URL in %d-th idp', i)
continue

View File

@ -25,7 +25,7 @@ def create_metadata(request):
for public_key in app_settings.PUBLIC_KEYS:
if public_key.startswith('/'):
# clean PEM file
public_key = ''.join(file(public_key).read().splitlines()[1:-1])
public_key = ''.join(open(public_key).read().splitlines()[1:-1])
public_keys.append(public_key)
name_id_formats = app_settings.NAME_ID_FORMATS
cache[entity_id] = render_to_string('mellon/metadata.xml', {

View File

@ -12,7 +12,7 @@ from mellon.backends import SAMLBackend
pytestmark = pytest.mark.django_db
idp = {
'METADATA': file('tests/metadata.xml').read(),
'METADATA': open('tests/metadata.xml').read(),
}
saml_attributes = {
'name_id_format': lasso.SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT,

View File

@ -61,7 +61,7 @@ def test_create_server_invalid_metadata_file(mocker, rf, private_settings, caplo
]
request = rf.get('/')
assert not 'failed with error' in caplog.text
with mock.patch('mellon.adapters.file', mock.mock_open(read_data='yyy'), create=True):
with mock.patch('mellon.adapters.open', mock.mock_open(read_data='yyy'), create=True):
with HTTMock(error_500):
server = create_server(request)
assert len(server.providers) == 0
@ -75,7 +75,7 @@ def test_create_server_good_metadata_file(mocker, rf, private_settings, caplog):
]
request = rf.get('/')
with mock.patch(
'mellon.adapters.file', mock.mock_open(read_data=file('tests/metadata.xml').read()),
'mellon.adapters.open', mock.mock_open(read_data=open('tests/metadata.xml').read()),
create=True):
server = create_server(request)
assert 'ERROR' not in caplog.text
@ -85,7 +85,7 @@ def test_create_server_good_metadata_file(mocker, rf, private_settings, caplog):
def test_create_server_good_metadata(mocker, rf, private_settings, caplog):
private_settings.MELLON_IDENTITY_PROVIDERS = [
{
'METADATA': file('tests/metadata.xml').read(),
'METADATA': open('tests/metadata.xml').read(),
}
]
request = rf.get('/')
@ -131,7 +131,7 @@ def test_create_metadata(rf, private_settings, caplog):
private_settings.MELLON_NAME_ID_FORMATS = [lasso.SAML2_NAME_IDENTIFIER_FORMAT_UNSPECIFIED]
private_settings.MELLON_DEFAULT_ASSERTION_CONSUMER_BINDING = 'artifact'
request = rf.get('/')
with mock.patch('mellon.utils.file', mock.mock_open(read_data='BEGIN\nyyy\nEND'), create=True):
with mock.patch('mellon.utils.open', mock.mock_open(read_data='BEGIN\nyyy\nEND'), create=True):
metadata = create_metadata(request)
assert_xml_constraints(
metadata.encode('utf-8'),

View File

@ -83,7 +83,7 @@ def test_metadata(private_settings, client):
},
]
with mock.patch('mellon.utils.file', mock.mock_open(read_data='BEGIN\nyyy\nEND'), create=True):
with mock.patch('mellon.utils.open', mock.mock_open(read_data='BEGIN\nyyy\nEND'), create=True):
response = client.get('/metadata/')
assert_xml_constraints(
response.content,

View File

@ -13,7 +13,7 @@ def html_response(url, request):
@all_requests
def metadata_response(url, request):
return response(200, content=file('tests/metadata.xml').read())
return response(200, content=open('tests/metadata.xml').read())
def reset_caplog(cap):