mirror of
https://github.com/python/cpython.git
synced 2025-08-30 05:35:08 +00:00
A tentative fix for SF bug #503837 (Roeland Rengelink):
type.__module__ problems (again?) This simply initializes the __module__ local in a class statement from the __name__ global. I'm not 100% sure that this is the correct fix, although it usually does the right thing. The problem is that if the class statement executes in a custom namespace, the __name__ global may be taken from __builtins__, in which case it would have the value __builtin__, or it may not exist at all (if the custom namespace also has a custom __builtins__), in which case the class statement will fail. Nevertheless, unless someone finds a better solution, this is a 2.2.1 bugfix too.
This commit is contained in:
parent
7668957508
commit
340cbe74b9
1 changed files with 3 additions and 0 deletions
|
@ -3926,6 +3926,9 @@ compile_classdef(struct compiling *c, node *n)
|
|||
/* classdef: 'class' NAME ['(' testlist ')'] ':' suite */
|
||||
c->c_name = STR(CHILD(n, 1));
|
||||
c->c_private = c->c_name;
|
||||
/* Initialize local __module__ from global __name__ */
|
||||
com_addop_name(c, LOAD_GLOBAL, "__name__");
|
||||
com_addop_name(c, STORE_NAME, "__module__");
|
||||
ch = CHILD(n, NCH(n)-1); /* The suite */
|
||||
doc = get_docstring(c, ch);
|
||||
if (doc != NULL) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue