Skip to content
Snippets Groups Projects
Commit e0242435 authored by Studer Gabriel's avatar Studer Gabriel
Browse files

sorting by custom key has changed in Python 3

parent ba502e47
Branches
No related tags found
No related merge requests found
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
from ._ost_gfx import * from ._ost_gfx import *
from .py_gfx_obj import PyGfxObj from .py_gfx_obj import PyGfxObj
import functools
WHITE=RGB(1.0,1.0,1.0) WHITE=RGB(1.0,1.0,1.0)
BLACK=RGB(0.0,0.0,0.0) BLACK=RGB(0.0,0.0,0.0)
...@@ -94,8 +95,10 @@ def FitToScreen(gfx_ent, width=None, height=None, margin=0.05): ...@@ -94,8 +95,10 @@ def FitToScreen(gfx_ent, width=None, height=None, margin=0.05):
max_proj=max(proj, max_proj) max_proj=max(proj, max_proj)
lengths.append(max_proj-min_proj) lengths.append(max_proj-min_proj)
def cmp_x(rhs, lhs): def cmp_x(rhs, lhs):
return cmp(lhs[1], rhs[1]) # replaced cmp when porting to Python 3
sorted_axes=sorted(zip(rows, lengths), cmp_x) #return cmp(lhs[1], rhs[1])
return (lhs[1] > rhs[1]) - (lhs[1] < rhs[1])
sorted_axes=sorted(zip(rows, lengths), key=functools.cmp_to_key(cmp_x))
return [r*l for r,l in sorted_axes] return [r*l for r,l in sorted_axes]
scene=Scene() scene=Scene()
if not isinstance(gfx_ent, Entity): if not isinstance(gfx_ent, Entity):
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment