diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-04-20 12:25:59 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-04-20 12:25:59 -0400 |
| commit | faf2b8802dc8257d43afc5de5fb9606103857e55 (patch) | |
| tree | 4982dfa251566ed9994a67af3e27111480341e24 /coverage/tracer.c | |
| parent | 3afa8830b5b7fb71168a6c7395b49f18f1463fb9 (diff) | |
| download | python-coveragepy-git-faf2b8802dc8257d43afc5de5fb9606103857e55.tar.gz | |
Fix another conflict.
Diffstat (limited to 'coverage/tracer.c')
| -rw-r--r-- | coverage/tracer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coverage/tracer.c b/coverage/tracer.c index 32f7c656..89de7dcf 100644 --- a/coverage/tracer.c +++ b/coverage/tracer.c @@ -815,7 +815,7 @@ CTracer_handle_return(CTracer *self, PyFrameObject *frame) if (self->pdata_stack->depth >= 0) { if (self->tracing_arcs && self->cur_entry.file_data) { /* Need to distinguish between RETURN_VALUE and YIELD_VALUE. */ - int bytecode = MyText_AS_STRING(frame->f_code->co_code)[frame->f_lasti]; + int bytecode = MyText_AsString(frame->f_code->co_code)[frame->f_lasti]; if (bytecode != YIELD_VALUE) { int first = frame->f_code->co_firstlineno; if (CTracer_record_pair(self, self->cur_entry.last_line, -first) < 0) { |