diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-06-22 21:49:39 (GMT) | 
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-06-22 21:49:39 (GMT) | 
| commit | 9aee2c81eaf28aef0f9f12f857693c3508791839 (patch) | |
| tree | b01775893bc106d076015c843de49c6746b3f61e /Python/compile.c | |
| parent | 945c579829e95c31e6808400b90714168598158e (diff) | |
| download | cpython-9aee2c81eaf28aef0f9f12f857693c3508791839.zip cpython-9aee2c81eaf28aef0f9f12f857693c3508791839.tar.gz cpython-9aee2c81eaf28aef0f9f12f857693c3508791839.tar.bz2  | |
Merged revisions 82169 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
  r82169 | antoine.pitrou | 2010-06-22 23:42:05 +0200 (mar., 22 juin 2010) | 4 lines
  Fix misindents in compile.c (for Benjamin).
  Of course, whoever used the wrong indentation rules needs to be spanked.
........
Diffstat (limited to 'Python/compile.c')
| -rw-r--r-- | Python/compile.c | 22 | 
1 files changed, 11 insertions, 11 deletions
diff --git a/Python/compile.c b/Python/compile.c index c9f6e8d..aae0339 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -968,7 +968,7 @@ compiler_addop_o(struct compiler *c, int opcode, PyObject *dict,  {      int arg = compiler_add_o(c, dict, o);      if (arg < 0) -    return 0; +        return 0;      return compiler_addop_i(c, opcode, arg);  } @@ -979,11 +979,11 @@ compiler_addop_name(struct compiler *c, int opcode, PyObject *dict,      int arg;      PyObject *mangled = _Py_Mangle(c->u->u_private, o);      if (!mangled) -    return 0; +        return 0;      arg = compiler_add_o(c, dict, mangled);      Py_DECREF(mangled);      if (arg < 0) -    return 0; +        return 0;      return compiler_addop_i(c, opcode, arg);  } @@ -1134,7 +1134,7 @@ static int  compiler_isdocstring(stmt_ty s)  {      if (s->kind != Expr_kind) -    return 0; +        return 0;      return s->v.Expr.value->kind == Str_kind;  } @@ -1240,11 +1240,11 @@ compiler_lookup_arg(PyObject *dict, PyObject *name)      PyObject *k, *v;      k = PyTuple_Pack(2, name, name->ob_type);      if (k == NULL) -    return -1; +        return -1;      v = PyDict_GetItem(dict, k);      Py_DECREF(k);      if (v == NULL) -    return -1; +        return -1;      return PyLong_AS_LONG(v);  } @@ -3073,7 +3073,7 @@ compiler_with(struct compiler *c, stmt_ty s)      block = compiler_new_block(c);      finally = compiler_new_block(c);      if (!block || !finally) -    return 0; +        return 0;      /* Evaluate EXPR */      VISIT(c, expr, s->v.With.context_expr); @@ -3082,15 +3082,15 @@ compiler_with(struct compiler *c, stmt_ty s)      /* SETUP_WITH pushes a finally block. */      compiler_use_next_block(c, block);      if (!compiler_push_fblock(c, FINALLY_TRY, block)) { -    return 0; +        return 0;      }      if (s->v.With.optional_vars) { -    VISIT(c, expr, s->v.With.optional_vars); +        VISIT(c, expr, s->v.With.optional_vars);      }      else {      /* Discard result from context.__enter__() */ -    ADDOP(c, POP_TOP); +        ADDOP(c, POP_TOP);      }      /* BLOCK code */ @@ -3103,7 +3103,7 @@ compiler_with(struct compiler *c, stmt_ty s)      ADDOP_O(c, LOAD_CONST, Py_None, consts);      compiler_use_next_block(c, finally);      if (!compiler_push_fblock(c, FINALLY_END, finally)) -    return 0; +        return 0;      /* Finally block starts; context.__exit__ is on the stack under         the exception or return information. Just issue our magic  | 
