33,37d32
< try:
< import info
< except ImportError:
< info = None
<
147,148d141
< add_option("--trace-cycle", metavar="CYCLE", default='0',
< help="Start tracing at CYCLE")
213a207,208
> import defines
> import info
281,288c276,277
< # set tracing options
< objects.Trace.flags = options.trace_flags
< objects.Trace.start = options.trace_start
< objects.Trace.cycle = options.trace_cycle
< objects.Trace.file = options.trace_file
< objects.Trace.bufsize = options.trace_circlebuf
< objects.Trace.dump_on_exit = options.trace_dumponexit
< objects.Trace.ignore = options.trace_ignore
---
> for flag in options.trace_flags:
> internal.trace.setFlag(flag)
289a279,296
> if options.trace_start is not None:
> internal.trace.enabled = False
> def enable_trace():
> internal.event.enabled = True
> internal.event.create(enable_trace, options.trace_start)
>
> if options.trace_file is not None:
> internal.trace.file(options.trace_file)
>
> if options.trace_bufsize is not None:
> internal.trace.buffer_size(options.bufsize)
>
> #if options.trace_dumponexit:
> # internal.trace.dumpOnExit = True
>
> for ignore in options.trace_ignore:
> internal.trace.ignore(ignore)
>
312c319
< exec("import readline", scope)
---
> exec "import readline" in scope