diff --git a/tools/analysis/resultbrowser/app/data.py b/tools/analysis/resultbrowser/app/data.py index da24db22..15528314 100644 --- a/tools/analysis/resultbrowser/app/data.py +++ b/tools/analysis/resultbrowser/app/data.py @@ -1,6 +1,6 @@ from pprint import pprint -import details -import model +from . import details +from . import model def scrub(table_name): return ''.join( chr for chr in table_name if chr.isalnum() or chr == '_' ) @@ -134,7 +134,7 @@ class Overview: variant = table.getVariantById(variant_id) if variant: return variant - print "Variant not found." + print("Variant not found.") return None def length(self): diff --git a/tools/analysis/resultbrowser/app/details.py b/tools/analysis/resultbrowser/app/details.py index e58cb25d..b288424d 100644 --- a/tools/analysis/resultbrowser/app/details.py +++ b/tools/analysis/resultbrowser/app/details.py @@ -143,7 +143,7 @@ class DetailDealer: self.reload(configfile) if not self.tables: - print "DetailDealer: no details found for " + configfile + print("DetailDealer: no details found for " + configfile) def reload(self, configfile): self.tables = {} diff --git a/tools/analysis/resultbrowser/app/model.py b/tools/analysis/resultbrowser/app/model.py index 1ee5e1f4..d9529f2e 100755 --- a/tools/analysis/resultbrowser/app/model.py +++ b/tools/analysis/resultbrowser/app/model.py @@ -7,8 +7,8 @@ import sys import os.path from pprint import pprint -import data -import details +from . import data +from . import details """Get command line options""" from optparse import OptionParser @@ -24,7 +24,7 @@ def checkConfigFile(msg, fname): if not os.path.isfile(fname): sys.exit("Error: '" + fname + "' not found") else: - print msg, "->", fname + print(msg, "->", fname) # Check sql config sqlconfig = opts.config @@ -99,9 +99,9 @@ def reloadOverview(): return overview, objdump_exists """Load overview data at server startup""" -print "Loading overview data from database. This may take a while ..." +print("Loading overview data from database. This may take a while ...") overview_data, objdump_exists = reloadOverview() -print "done." +print("done.") ## Get overview data for views.index() def getOverview(): return overview_data diff --git a/tools/analysis/resultbrowser/app/views.py b/tools/analysis/resultbrowser/app/views.py index 19ea6999..240802d7 100644 --- a/tools/analysis/resultbrowser/app/views.py +++ b/tools/analysis/resultbrowser/app/views.py @@ -1,15 +1,18 @@ from flask import render_template,request from app import app -import model -import data +# import model +# import data + +from . import model +from . import data @app.route('/') @app.route('/index') def index(): reload_overview = request.args.get('reload', False) if reload_overview: - print "Reloading overview..." + print("Reloading overview...") model.reloadOverview() return render_template("index.html", overview=model.getOverview(), objdump_there = model.objdumpExists())