mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Negative subscript are now allowed as in slices.

Browse source 
Added ImportError.
This commit is contained in:
Guido van Rossum 1991-12-24 13:25:19 +00:00
parent ed7711b7cb
commit 98256aa518
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Python/ceval.c
View file

@ -1511,6 +1511,8 @@ apply_subscript(v, w)
return NULL;
}
i = getintvalue(w);
if (i < 0)
i += (*tp->tp_as_sequence->sq_length)(v);
return (*tp->tp_as_sequence->sq_item)(v, i);
}
return (*tp->tp_as_mapping->mp_subscript)(v, w);
@ -1584,11 +1586,15 @@ assign_subscript(w, key, v) /* w[key] = v */
(func = sq->sq_ass_item) != NULL) {
if (!is_intobject(key)) {
err_setstr(TypeError,
"sequence subscript must be integer");
"sequence subscript must be integer (assign or del)");
return -1;
}
else
return (*func)(w, (int)getintvalue(key), v);
else {
int i = getintvalue(key);
if (i < 0)
i += (*sq->sq_length)(v);
return (*func)(w, i, v);
}
}
else if ((mp = tp->tp_as_mapping) != NULL &&
(func = mp->mp_ass_subscript) != NULL) {
@ -1726,8 +1732,6 @@ cmp_outcome(op, v, w)
return v;
}
/* XXX This function should use dict2 variants (change interface!) */
static int
import_from(locals, v, name)
object *locals;
@ -1746,7 +1750,7 @@ import_from(locals, v, name)
x = dict2lookup(w, name);
if (x == NULL) {
/* XXX can't happen? */
err_setstr(NameError, getstringvalue(name));
err_setstr(SystemError, getstringvalue(name));
return -1;
}
if (dict2insert(locals, name, x) != 0)
@ -1757,7 +1761,10 @@ import_from(locals, v, name)
else {
x = dict2lookup(w, name);
if (x == NULL) {
err_setstr(NameError, getstringvalue(name));
char buf[250];
sprintf(buf, "cannot import name %s",
getstringvalue(name));
err_setstr(ImportError, buf);
return -1;
}
else