christoph/fail
1
Fork 0
Code Releases Activity

port resultbrowser to python3

Browse Source
This commit is contained in:
Robin Thunig
2021-12-15 00:30:10 +01:00
parent da7af918c6
commit 4d7ccd2d86
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/analysis/resultbrowser/app/data.py
View File

@ -1,6 +1,6 @@
from pprint import pprint from pprint import pprint
import details from . import details
import model from . import model
def scrub(table_name): def scrub(table_name):
return ''.join( chr for chr in table_name if chr.isalnum() or chr == '_' ) return ''.join( chr for chr in table_name if chr.isalnum() or chr == '_' )
@ -134,7 +134,7 @@ class Overview:
variant = table.getVariantById(variant_id) variant = table.getVariantById(variant_id)
if variant: if variant:
return variant return variant
print "Variant not found." print("Variant not found.")
return None return None
def length(self): def length(self):

2
tools/analysis/resultbrowser/app/details.py
View File

@ -143,7 +143,7 @@ class DetailDealer:
self.reload(configfile) self.reload(configfile)
if not self.tables: if not self.tables:
print "DetailDealer: no details found for " + configfile print("DetailDealer: no details found for " + configfile)
def reload(self, configfile): def reload(self, configfile):
self.tables = {} self.tables = {}

10
tools/analysis/resultbrowser/app/model.py
View File

@ -7,8 +7,8 @@ import sys
import os.path import os.path
from pprint import pprint from pprint import pprint
import data from . import data
import details from . import details
"""Get command line options""" """Get command line options"""
from optparse import OptionParser from optparse import OptionParser
@ -24,7 +24,7 @@ def checkConfigFile(msg, fname):
if not os.path.isfile(fname): if not os.path.isfile(fname):
sys.exit("Error: '" + fname + "' not found") sys.exit("Error: '" + fname + "' not found")
else: else:
print msg, "->", fname print(msg, "->", fname)
# Check sql config # Check sql config
sqlconfig = opts.config sqlconfig = opts.config
@ -99,9 +99,9 @@ def reloadOverview():
return overview, objdump_exists return overview, objdump_exists
"""Load overview data at server startup""" """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() overview_data, objdump_exists = reloadOverview()
print "done." print("done.")
## Get overview data for views.index() ## Get overview data for views.index()
def getOverview(): def getOverview():
return overview_data return overview_data

9
tools/analysis/resultbrowser/app/views.py
View File

@ -1,15 +1,18 @@
from flask import render_template,request from flask import render_template,request
from app import app from app import app
import model # import model
import data # import data
from . import model
from . import data
@app.route('/') @app.route('/')
@app.route('/index') @app.route('/index')
def index(): def index():
reload_overview = request.args.get('reload', False) reload_overview = request.args.get('reload', False)
if reload_overview: if reload_overview:
print "Reloading overview..." print("Reloading overview...")
model.reloadOverview() model.reloadOverview()
return render_template("index.html", overview=model.getOverview(), objdump_there = model.objdumpExists()) return render_template("index.html", overview=model.getOverview(), objdump_there = model.objdumpExists())