From 5f1e91d7a56f50db8ceb7cf58c53a023cb06b8ee Mon Sep 17 00:00:00 2001 From: Maciej Dziardziel Date: Mon, 30 Jun 2014 17:23:58 +0100 Subject: [PATCH 1/2] python 3 fixes --- resweb/core.py | 14 +++++++------- resweb/views.py | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/resweb/core.py b/resweb/core.py index 053a7af..6528782 100644 --- a/resweb/core.py +++ b/resweb/core.py @@ -38,7 +38,7 @@ def authenticate(): def requires_auth(f): @wraps(f) def decorated(*args, **kwargs): - print app.config.get('BASIC_AUTH') + print(app.config.get('BASIC_AUTH')) auth = request.authorization if app.config.get('BASIC_AUTH') and (not auth or not check_auth(auth.username, auth.password)): return authenticate() @@ -192,7 +192,7 @@ def worker(worker_id): 'resweb_version': view_worker.resweb_version(), 'address': view_worker.address() } - print data + print(data) return render_template('worker.html', data=data) @app.route('/workers/') @@ -207,7 +207,7 @@ def workers(): 'resweb_version': view_workers.resweb_version(), 'address': view_workers.address() } - print data + print(data) return render_template('workers.html', data=data) @app.route('/stats/') @@ -228,7 +228,7 @@ def stats(key): 'resweb_version': view_stats.resweb_version(), 'address': view_stats.address() } - print data + print(data) return render_template('stats.html', data=data) @app.route('/stat//') @@ -245,7 +245,7 @@ def stat(stat_id): 'resweb_version': view_stat.resweb_version(), 'address': view_stat.address() } - print data + print(data) return render_template('stat.html', data=data) @app.route('/delayed/') @@ -262,7 +262,7 @@ def delayed(): 'resweb_version': view_delayed.resweb_version(), 'address': view_delayed.address() } - print data + print(data) return render_template('delayed.html', data=data) @app.route('/delayed//') @@ -280,7 +280,7 @@ def delayed_timestamp(timestamp): 'resweb_version': view_dt.resweb_version(), 'address': view_dt.address() } - print data + print(data) return render_template('delayed_timestamp.html', data=data) def main(): diff --git a/resweb/views.py b/resweb/views.py index fb00014..7f4be44 100644 --- a/resweb/views.py +++ b/resweb/views.py @@ -1,3 +1,4 @@ +from __future__ import division from pyres import __version__ from resweb import __version__ as res_version from pyres.worker import Worker as Wrkr From c420383ac5f490afb06fea85e2418b8070ddcc93 Mon Sep 17 00:00:00 2001 From: Maciej Dziardziel Date: Tue, 1 Jul 2014 12:30:52 +0100 Subject: [PATCH 2/2] mend --- resweb/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resweb/views.py b/resweb/views.py index 7f4be44..7a6912b 100644 --- a/resweb/views.py +++ b/resweb/views.py @@ -31,7 +31,7 @@ def resweb_version(self): def pages(self, start, size, link_function, width=20): pages = [] - num_pages = size / width + num_pages = size // width if size % width > 0: num_pages += 1