Mercurial > cpython-lru_cache-weakref

comparison Python/pythonrun.c @ 66664:62b61abd02b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branches/pep-0384.
author Martin v. Löwis <martin@v.loewis.de>
date Fri, 03 Dec 2010 20:14:31 +0000
parents 724920a015f7
children 713c6b6ca5ce
comparison
equal deleted inserted replaced
66663:3d9a86b8cc98 66664:62b61abd02b8
1753 PyCodeObject *co; 1753 PyCodeObject *co;
1754 PyObject *v; 1754 PyObject *v;
1755 co = PyAST_Compile(mod, filename, flags, arena); 1755 co = PyAST_Compile(mod, filename, flags, arena);
1756 if (co == NULL) 1756 if (co == NULL)
1757 return NULL; 1757 return NULL;
1758 v = PyEval_EvalCode(co, globals, locals); 1758 v = PyEval_EvalCode((PyObject*)co, globals, locals);
1759 Py_DECREF(co); 1759 Py_DECREF(co);
1760 return v; 1760 return v;
1761 } 1761 }
1762 1762
1763 static PyObject * 1763 static PyObject *
1783 PyErr_SetString(PyExc_RuntimeError, 1783 PyErr_SetString(PyExc_RuntimeError,
1784 "Bad code object in .pyc file"); 1784 "Bad code object in .pyc file");
1785 return NULL; 1785 return NULL;
1786 } 1786 }
1787 co = (PyCodeObject *)v; 1787 co = (PyCodeObject *)v;
1788 v = PyEval_EvalCode(co, globals, locals); 1788 v = PyEval_EvalCode((PyObject*)co, globals, locals);
1789 if (v && flags) 1789 if (v && flags)
1790 flags->cf_flags |= (co->co_flags & PyCF_MASK); 1790 flags->cf_flags |= (co->co_flags & PyCF_MASK);
1791 Py_DECREF(co); 1791 Py_DECREF(co);
1792 return v; 1792 return v;
1793 } 1793 }
1813 return result; 1813 return result;
1814 } 1814 }
1815 co = PyAST_Compile(mod, filename, flags, arena); 1815 co = PyAST_Compile(mod, filename, flags, arena);
1816 PyArena_Free(arena); 1816 PyArena_Free(arena);
1817 return (PyObject *)co; 1817 return (PyObject *)co;
1818 }
1819
1820 /* For use in Py_LIMITED_API */
1821 #undef Py_CompileString
1822 PyObject *
1823 PyCompileString(const char *str, const char *filename, int start)
1824 {
1825 return Py_CompileStringFlags(str, filename, start, NULL);
1818 } 1826 }
1819 1827
1820 struct symtable * 1828 struct symtable *
1821 Py_SymtableString(const char *str, const char *filename, int start) 1829 Py_SymtableString(const char *str, const char *filename, int start)
1822 { 1830 {