changeset 1341:31a1534f6b77

runtime: Priorize mixins over base runtime. Otherwise, BasicActiveRuntime.get_triple() overwrites get_triple() of the chosen mixin.
author Marcel Keller <mkeller@cs.au.dk>
date Tue, 27 Oct 2009 20:45:20 +0100
parents 614c32bfe8fb
children 3a87b4d84eb6
files viff/runtime.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/viff/runtime.py	Tue Oct 27 19:59:42 2009 +0100
+++ b/viff/runtime.py	Tue Oct 27 20:45:20 2009 +0100
@@ -950,7 +950,7 @@
         # We must include at least one new-style class in bases. We
         # include it last to avoid overriding __init__ from the other
         # base classes.
-        bases = (runtime_class,) + tuple(mixins) + (object,)
+        bases = tuple(mixins) + (runtime_class,) + (object,)
         return type("ExtendedRuntime", bases, {})
 
 def create_runtime(id, players, threshold, options=None, runtime_class=None):