Changeset - 86c43281b1b4
[Not reviewed]
version_5
0 1 0
Dennis Fink - 10 years ago 2015-08-30 15:21:13
dennis.fink@c3l.lu
Use .format for string formatting instead of % interpolation
1 file changed with 9 insertions and 4 deletions:
0 comments (0 inline, 0 general)
ennstatus/api/views.py
Show inline comments
 
@@ -98,15 +98,20 @@ def update():
 
        server.save()
 
    except Exception as e:
 
        current_app.logger.error(str(e))
 
        return str(e), 500, {'Content-Type': 'text/plain'}
 

	
 
    current_app.logger.info('Return result')
 
    return (server.json(), 201,
 
            {'Location': '/api/export/json/single?server_name=%s'
 
             % server.name})
 
    return (
 
        server.json(), 201,
 
        {
 
            'Location': '/api/export/json/single?server_name={}'.format(
 
                server.name
 
            )
 
        }
 
    )
 

	
 

	
 
@api_page.route('/export', defaults={'server_type': 'all',
 
                                     'export_format': 'json'})
 
@api_page.route('/export/<any("json", "xml"):export_format>',
 
                defaults={'server_type': 'all'})
 
@@ -143,13 +148,13 @@ def export(export_format, server_type):
 

	
 
    else:
 
        if server_type == 'all':
 
            current_app.logger.info('Getting all servers!')
 
            servers = [server.json() for server in all_servers()]
 
        else:
 
            current_app.logger.info('Getting all %s!' % server_type)
 
            current_app.logger.info('Getting all {}!'.format(server_type))
 
            servers = list(all_servers_by_type(server_type.lower()))
 

	
 
        if export_format == 'json':
 
            current_app.logger.info('Returning as json!')
 
            return str(servers)
 
        else:
0 comments (0 inline, 0 general)