Merge pull request #51 from flask-dashboard/python3.5

Python3.5

Author: mircealungu

README.md

@@ -9,7 +9,11 @@ You can see the execution time and last access time per endpoint.
 
 Also, unit tests can be run by TravisCI and monitored.
 
-IMPORTANT: Since the implementation uses string interpolation, the minimum python version is 3.6 [PEP 498](https://www.python.org/dev/peps/pep-0498/).
+Python version
+==============
+The minimum Python version that we use for this project is Python 3.5. 
+However, it will also work in Python 3.4, but we do not maintain support for this version.
+
 
 Installation
 ============
@@ -102,5 +106,5 @@ This extra method is needed for the logging, and without it, the unit test resul
 
 Screenshots
 ===========
-![Screenshot 1](/images/screenshot1.png)
-![Screenshot 2](/images/screenshot2.png)
+![Screenshot 1](/docs/img/screenshot1.png)
+![Screenshot 2](/docs/img/screenshot2.png)

dashboard/routings/export_data.py

@@ -17,8 +17,8 @@
 def download_csv():
     csv = '"ENDPOINT","EXECUTION_TIME","TIME_OF_EXECUTION","VERSION","GROUP_BY","IP_ADDRESS"\n'
     for entry in get_data():
-        csv += f'"{entry.endpoint}",{entry.execution_time},"{entry.time}","{entry.version}","{entry.group_by}",' \
-               f'"{entry.ip}"\n'
+        csv += '"{}",{},"{}","{}","{}","{}"\n'.format(entry.endpoint, entry.execution_time, entry.time, entry.version,
+                                                      entry.group_by, entry.ip)
 
     response = make_response(csv)
     response.headers["Content-Disposition"] = "attachment; filename=measurements_{0}.csv".format(
@@ -32,8 +32,8 @@ def export_data():
     csv = ['"ENDPOINT","EXECUTION_TIME","TIME_OF_EXECUTION","VERSION","GROUP_BY","IP_ADDRESS"']
     data = get_data()
     for entry in data:
-        csv.append(f'"{entry.endpoint}","{entry.execution_time}","{entry.time}","{entry.version}","{entry.group_by}",'
-                   f'"{entry.ip}"')
+        csv.append('"{}","{}","{}","{}","{}","{}"'.format(entry.endpoint, entry.execution_time, entry.time,
+                                                          entry.version, entry.group_by, entry.ip))
     return render_template('dashboard/export-data.html', link=config.link, session=session, data=csv)
 
 
@@ -99,7 +99,7 @@ def get_json_data_from(security_token: str, time_from: int):
             })
         return jsonify(data)
     except ValueError as e:
-        return f'ValueError: {e}'
+        return 'ValueError: {}'.format(e)
 
 
 @blueprint.route('/get_json_monitor_rules/<security_token>')
@@ -123,4 +123,4 @@ def get_json_monitor_rules(security_token: str):
             })
         return jsonify(data)
     except ValueError as e:
-        return f'ValueError: {e}'
+        return 'ValueError: {}'.format(e)