Skip to content

Fixed string encoding for WebPlugin webapp.py for Python3 #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dfupa wants to merge 2 commits into
base: ete3
Choose a base branch
from
Open

Fixed string encoding for WebPlugin webapp.py for Python3 #478

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d504ac
Fixing webapp.py Python3 encoding incompatibility
Dfupa Sep 7, 2020
3801893
Update webapp.py
Dfupa Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 31 additions & 36 deletions ete3/webplugin/webapp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,16 +166,15 @@ def _load_tree(self, treeid, tree=None, cache_file=None):
# if no tree is given, and not in memmory, it tries to loaded
# from previous sessions
if treeid not in self._treeid2tree:
self._load_tree_from_path(self._treeid2cache[treeid])
self._load_tree_from_path(self._treeid2cache[treeid], treeid)

# Returns True if tree and indexes are loaded
return (treeid in self._treeid2tree) and (treeid in self._treeid2index)

def _load_tree_from_path(self, pkl_path):
def _load_tree_from_path(self, pkl_path, treeid):
tree_path = os.path.join(self.CONFIG["temp_dir"], pkl_path)
if os.path.exists(tree_path):
print(six.moves.cPickle.load(open(tree_path)))
t = self._treeid2tree[treeid] = six.moves.cPickle.load(open(tree_path))
t = self._treeid2tree[treeid] = six.moves.cPickle.load(open(tree_path, 'rb'))
self._load_tree_index(treeid)
return True
else:
Expand Down Expand Up @@ -216,7 +215,6 @@ def _get_tree_img(self, treeid, pre_drawing_action=None):
handler(t, arguments[0])
elif atype == "layout":
self._treeid2layout[treeid] = handler

layout_fn = self._treeid2layout.get(treeid, self._layout)
mapid = "img_map_"+str(time.time())
img_map = _render_tree(t, img_path, self.CONFIG["DISPLAY"], layout = layout_fn,
Expand All @@ -230,25 +228,22 @@ def _get_tree_img(self, treeid, pre_drawing_action=None):
if hasattr(n, "_QtItem_"):
n._QtItem_ = None
delattr(n, "_QtItem_")

tree_actions = []
for aindex, (action, target, handler, checker, html_generator) in enumerate(self.actions):
if target in self.TREE_TARGET_ACTIONS and (not checker or checker(t)):
tree_actions.append(aindex)

try:
version_tag = __version__
except NameError:
version_tag = "ete3"

self._dump_tree_to_file(t, treeid)

ete_publi = '<div style="margin:0px;padding:0px;text-align:left;"><a href="http://etetoolkit.org" style="font-size:7pt;" target="_blank" >%s</a></div>' %\
(version_tag)
img_html = """<img id="%s" class="ete_tree_img" src="%s" USEMAP="#%s" onLoad='javascript:bind_popup();' onclick='javascript:show_context_menu("%s", "", "%s");' >""" %\
(treeid, img_url, mapid, treeid, ','.join(map(str, tree_actions)))

tree_div_id = "ETE_tree_"+str(treeid)

return html_map+ '<div id="%s" >'%tree_div_id + img_html + ete_publi + "</div>"

# WSGI web application
Expand Down Expand Up @@ -292,47 +287,47 @@ def __call__(self, environ, start_response):

elif method == "get_menu":
if not self._load_tree(treeid):
return "get_menu: Cannot load the tree: %s" %treeid

if nodeid:
tree_index = self._treeid2index[treeid]
node = tree_index[nodeid]
html = "get_menu: Cannot load the tree: %s" %treeid
else:
node = None

if textface:
header = str(textface).strip()
else:
header = "Menu"
html = """<div id="ete_popup_header"><span id="ete_popup_header_text">%s</span><div id="ete_close_popup" onClick='hide_popup();'></div></div><ul>""" %\
(header)
for i in map(int, actions.split(",")):
aname, target, handler, checker, html_generator = self.actions[i]
if html_generator:
html += html_generator(i, treeid, nodeid, textface, node)
if nodeid:
tree_index = self._treeid2index[treeid]
node = tree_index[nodeid]
else:
node = None
if textface:
header = str(textface).strip()
else:
html += """<li><a href='javascript:void(0);' onClick='hide_popup(); run_action("%s", "%s", "%s");'> %s </a></li> """ %\
(treeid, nodeid, i, aname)
html += '</ul>'
return html
header = "Menu"
html = """<div id="ete_popup_header"><span id="ete_popup_header_text">%s</span>
<div id="ete_close_popup" onClick='hide_popup();'></div></div>
<ul>""" % (header)
for i in map(int, actions.split(",")):

aname, target, handler, checker, html_generator = self.actions[i]
if html_generator:
html += html_generator(i, treeid, nodeid, textface, node)
else:
html += """<li><a href='javascript:void(0);' onClick='hide_popup(); run_action("%s", "%s", "%s");'> %s </a></li> """ %\
(treeid, nodeid, i, aname)
html += '</ul>'
return [html.encode('utf-8')]

elif method == "action":
if not self._load_tree(treeid):
return "action: Cannot load the tree: %s" %treeid

if aindex is None:
# just refresh tree
return self._get_tree_img(treeid=treeid)
return [self._get_tree_img(treeid=treeid).encode('utf-8')]
else:
aname, target, handler, checker, html_generator = self.actions[int(aindex)]

if target in set(["node", "face", "layout"]):
return self._get_tree_img(treeid=treeid, pre_drawing_action=[target, handler, [nodeid]])
return [self._get_tree_img(treeid=treeid, pre_drawing_action=[target, handler, [nodeid]]).encode('utf-8')]
elif target in set(["search"]):
return self._get_tree_img(treeid=treeid, pre_drawing_action=[target, handler, [search_term]])
return [self._get_tree_img(treeid=treeid, pre_drawing_action=[target, handler, [search_term]]).encode('utf-8')]
elif target in set(["refresh"]):
return self._get_tree_img(treeid=treeid)
return "Bad guy"
return [self._get_tree_img(treeid=treeid).encode('utf-8')]
return str.encode("Bad guy")

elif self._external_app_handler:
return self._external_app_handler(environ, start_response, self.queries)
Expand Down