Index: org/python/compiler/CodeCompiler.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/CodeCompiler.java,v retrieving revision 2.32 diff -u -r2.32 CodeCompiler.java --- org/python/compiler/CodeCompiler.java 25 Aug 2003 12:24:14 -0000 2.32 +++ org/python/compiler/CodeCompiler.java 19 Dec 2003 04:20:24 -0000 @@ -35,6 +35,7 @@ public Code code; public ConstantPool pool; public CodeCompiler mrefs; + public CompilerFlags cflags; int temporary; int augmode; @@ -201,6 +202,7 @@ this.fast_locals = fast_locals; this.className = className; this.code = code; + this.cflags = cflags; my_scope = scope; names = scope.names; @@ -369,7 +371,7 @@ scope.dump(); module.PyCode(new Suite(node.body, node), name, true, className, false, false, - node.beginLine, scope).get(code); + node.beginLine, scope, cflags).get(code); Vector freenames = scope.freevars; getDocString(node.body); Index: org/python/compiler/Module.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/compiler/Module.java,v retrieving revision 2.13 diff -u -r2.13 Module.java --- org/python/compiler/Module.java 15 Oct 2002 14:32:28 -0000 2.13 +++ org/python/compiler/Module.java 19 Dec 2003 04:20:24 -0000 @@ -489,6 +489,9 @@ if (cflags != null && cflags.generator_allowed) { code.moreflags |= org.python.core.PyTableCode.CO_GENERATOR_ALLOWED; } + if (cflags != null && cflags.division) { + code.moreflags |= org.python.core.PyTableCode.CO_FUTUREDIVISION; + } code.module = this; code.name = code.fname; Index: org/python/core/__builtin__.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/__builtin__.java,v retrieving revision 2.57 diff -u -r2.57 __builtin__.java --- org/python/core/__builtin__.java 6 Aug 2003 11:46:26 -0000 2.57 +++ org/python/core/__builtin__.java 19 Dec 2003 04:20:25 -0000 @@ -275,9 +275,7 @@ code = (PyCode)o; else { if (o instanceof PyString) { - // eval does not inherit co_nested - code = Py.compile_flags(((PyString)o).toString(), - "", "eval", null); + code = compile(o.toString(), "", "eval"); } else throw Py.TypeError( "eval: argument 1 must be string or code object");