Mercurial > cpython-lru_cache-weakref

comparison Python/Python-ast.c @ 54918:0704f15b4682

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r73376 | benjamin.peterson | 2009-06-11 17:29:23 -0500 (Thu, 11 Jun 2009) | 1 line remove check for case handled in sub-function ........ r73393 | alexandre.vassalotti | 2009-06-12 13:56:57 -0500 (Fri, 12 Jun 2009) | 2 lines Clear reference to the static PyExc_RecursionErrorInst in _PyExc_Fini. ........ r73398 | alexandre.vassalotti | 2009-06-12 15:57:12 -0500 (Fri, 12 Jun 2009) | 3 lines Add const qualifier to PyErr_SetFromErrnoWithFilename and to PyErr_SetFromErrnoWithUnicodeFilename. ........ r73400 | alexandre.vassalotti | 2009-06-12 16:43:47 -0500 (Fri, 12 Jun 2009) | 2 lines Delete outdated make file for building the parser with MSVC 6. ........ r73404 | benjamin.peterson | 2009-06-12 20:40:00 -0500 (Fri, 12 Jun 2009) | 1 line keep the slice.step field as NULL if no step expression is given ........ r73405 | benjamin.peterson | 2009-06-12 22:46:30 -0500 (Fri, 12 Jun 2009) | 1 line prevent import statements from assigning to None ........ r73409 | benjamin.peterson | 2009-06-13 08:06:21 -0500 (Sat, 13 Jun 2009) | 1 line allow importing from a module named None if it has an 'as' clause ........ r73419 | benjamin.peterson | 2009-06-13 11:19:19 -0500 (Sat, 13 Jun 2009) | 1 line set Print.values to NULL if there are no values ........ r73420 | benjamin.peterson | 2009-06-13 12:08:53 -0500 (Sat, 13 Jun 2009) | 1 line give a better error message when deleting () ........ r73421 | benjamin.peterson | 2009-06-13 15:23:33 -0500 (Sat, 13 Jun 2009) | 1 line when no module is given in a 'from' relative import, make ImportFrom.module NULL ........ r73432 | amaury.forgeotdarc | 2009-06-14 16:20:40 -0500 (Sun, 14 Jun 2009) | 3 lines #6227: Because of a wrong indentation, the test was not testing what it should. Ensure that the snippet in doctest_aliases actually contains aliases. ........ r73457 | benjamin.peterson | 2009-06-16 18:13:09 -0500 (Tue, 16 Jun 2009) | 1 line add underscores ........ r73460 | benjamin.peterson | 2009-06-16 22:23:04 -0500 (Tue, 16 Jun 2009) | 1 line remove unused 'encoding' member from the compiler struct ........ r73485 | benjamin.peterson | 2009-06-19 17:07:47 -0500 (Fri, 19 Jun 2009) | 1 line remove duplicate test ........ r73486 | benjamin.peterson | 2009-06-19 17:09:17 -0500 (Fri, 19 Jun 2009) | 1 line add missing assertion #6313 ........ r73488 | benjamin.peterson | 2009-06-19 17:16:28 -0500 (Fri, 19 Jun 2009) | 1 line show that this one isn't used ........ r73489 | benjamin.peterson | 2009-06-19 17:21:12 -0500 (Fri, 19 Jun 2009) | 1 line use closures ........ r73501 | benjamin.peterson | 2009-06-21 18:01:07 -0500 (Sun, 21 Jun 2009) | 1 line don't need to add the name 'lambda' as assigned ........ r73502 | benjamin.peterson | 2009-06-21 18:03:36 -0500 (Sun, 21 Jun 2009) | 1 line remove tmpname support since it's no longer used ........ r73513 | benjamin.peterson | 2009-06-22 20:18:57 -0500 (Mon, 22 Jun 2009) | 1 line fix grammar ........ r73514 | benjamin.peterson | 2009-06-22 22:01:56 -0500 (Mon, 22 Jun 2009) | 1 line remove some unused symtable constants ........
author Benjamin Peterson <benjamin@python.org>
date Sun, 28 Jun 2009 19:19:51 +0000
parents debd14c489b9
children 36a7e96e90fb
comparison
equal deleted inserted replaced
54916:7c287d30023c 54918:0704f15b4682
1330 stmt_ty 1330 stmt_ty
1331 ImportFrom(identifier module, asdl_seq * names, int level, int lineno, int 1331 ImportFrom(identifier module, asdl_seq * names, int level, int lineno, int
1332 col_offset, PyArena *arena) 1332 col_offset, PyArena *arena)
1333 { 1333 {
1334 stmt_ty p; 1334 stmt_ty p;
1335 if (!module) {
1336 PyErr_SetString(PyExc_ValueError,
1337 "field module is required for ImportFrom");
1338 return NULL;
1339 }
1340 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p)); 1335 p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
1341 if (!p) 1336 if (!p)
1342 return NULL; 1337 return NULL;
1343 p->kind = ImportFrom_kind; 1338 p->kind = ImportFrom_kind;
1344 p->v.ImportFrom.module = module; 1339 p->v.ImportFrom.module = module;
4463 res = obj2ast_identifier(tmp, &module, arena); 4458 res = obj2ast_identifier(tmp, &module, arena);
4464 if (res != 0) goto failed; 4459 if (res != 0) goto failed;
4465 Py_XDECREF(tmp); 4460 Py_XDECREF(tmp);
4466 tmp = NULL; 4461 tmp = NULL;
4467 } else { 4462 } else {
4468 PyErr_SetString(PyExc_TypeError, "required field \"module\" missing from ImportFrom"); 4463 module = NULL;
4469 return 1;
4470 } 4464 }
4471 if (PyObject_HasAttrString(obj, "names")) { 4465 if (PyObject_HasAttrString(obj, "names")) {
4472 int res; 4466 int res;
4473 Py_ssize_t len; 4467 Py_ssize_t len;
4474 Py_ssize_t i; 4468 Py_ssize_t i;