You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

136 lines
4.3 KiB

Merged revisions 67028,67040,67044,67046,67052,67065,67070,67077,67082 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r67028 | benjamin.peterson | 2008-10-25 18:27:07 -0500 (Sat, 25 Oct 2008) | 1 line don't use a catch-all ........ r67040 | armin.rigo | 2008-10-28 12:01:21 -0500 (Tue, 28 Oct 2008) | 5 lines Fix one of the tests: it relied on being present in an "output test" in order to actually test what it was supposed to test, i.e. that the code in the __del__ method did not crash. Use instead the new helper test_support.captured_output(). ........ r67044 | amaury.forgeotdarc | 2008-10-29 18:15:57 -0500 (Wed, 29 Oct 2008) | 3 lines Correct error message in io.open(): closefd=True is the only accepted value with a file name. ........ r67046 | thomas.heller | 2008-10-30 15:18:13 -0500 (Thu, 30 Oct 2008) | 2 lines Fixed a modulefinder crash on certain relative imports. ........ r67052 | christian.heimes | 2008-10-30 16:26:15 -0500 (Thu, 30 Oct 2008) | 1 line Issue #4237: io.FileIO() was raising invalid warnings caused by insufficient initialization of PyFileIOObject struct members. ........ r67065 | benjamin.peterson | 2008-10-30 18:59:18 -0500 (Thu, 30 Oct 2008) | 1 line move unprefixed error into .c file ........ r67070 | benjamin.peterson | 2008-10-31 15:41:44 -0500 (Fri, 31 Oct 2008) | 1 line rephrase has_key doc ........ r67077 | benjamin.peterson | 2008-11-03 09:14:51 -0600 (Mon, 03 Nov 2008) | 1 line #4048 make the parser module accept relative imports as valid ........ r67082 | hirokazu.yamamoto | 2008-11-03 12:03:06 -0600 (Mon, 03 Nov 2008) | 2 lines Issue #3774: Fixed an error when create a Tkinter menu item without command and then remove it. Written by Guilherme Polo (gpolo). ........
17 years ago
14 years ago
  1. #include "Python.h"
  2. #include "pycore_ast.h" // _PyAST_GetDocString()
  3. #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined"
  4. #define ERR_LATE_FUTURE \
  5. "from __future__ imports must occur at the beginning of the file"
  6. static int
  7. future_check_features(PyFutureFeatures *ff, stmt_ty s, PyObject *filename)
  8. {
  9. int i;
  10. assert(s->kind == ImportFrom_kind);
  11. asdl_alias_seq *names = s->v.ImportFrom.names;
  12. for (i = 0; i < asdl_seq_LEN(names); i++) {
  13. alias_ty name = (alias_ty)asdl_seq_GET(names, i);
  14. const char *feature = PyUnicode_AsUTF8(name->name);
  15. if (!feature)
  16. return 0;
  17. if (strcmp(feature, FUTURE_NESTED_SCOPES) == 0) {
  18. continue;
  19. } else if (strcmp(feature, FUTURE_GENERATORS) == 0) {
  20. continue;
  21. } else if (strcmp(feature, FUTURE_DIVISION) == 0) {
  22. continue;
  23. } else if (strcmp(feature, FUTURE_ABSOLUTE_IMPORT) == 0) {
  24. continue;
  25. } else if (strcmp(feature, FUTURE_WITH_STATEMENT) == 0) {
  26. continue;
  27. } else if (strcmp(feature, FUTURE_PRINT_FUNCTION) == 0) {
  28. continue;
  29. } else if (strcmp(feature, FUTURE_UNICODE_LITERALS) == 0) {
  30. continue;
  31. } else if (strcmp(feature, FUTURE_BARRY_AS_BDFL) == 0) {
  32. ff->ff_features |= CO_FUTURE_BARRY_AS_BDFL;
  33. } else if (strcmp(feature, FUTURE_GENERATOR_STOP) == 0) {
  34. continue;
  35. } else if (strcmp(feature, FUTURE_ANNOTATIONS) == 0) {
  36. continue;
  37. } else if (strcmp(feature, "braces") == 0) {
  38. PyErr_SetString(PyExc_SyntaxError,
  39. "not a chance");
  40. PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset + 1);
  41. return 0;
  42. } else {
  43. PyErr_Format(PyExc_SyntaxError,
  44. UNDEFINED_FUTURE_FEATURE, feature);
  45. PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset + 1);
  46. return 0;
  47. }
  48. }
  49. return 1;
  50. }
  51. static int
  52. future_parse(PyFutureFeatures *ff, mod_ty mod, PyObject *filename)
  53. {
  54. int i, done = 0, prev_line = 0;
  55. if (!(mod->kind == Module_kind || mod->kind == Interactive_kind))
  56. return 1;
  57. if (asdl_seq_LEN(mod->v.Module.body) == 0)
  58. return 1;
  59. /* A subsequent pass will detect future imports that don't
  60. appear at the beginning of the file. There's one case,
  61. however, that is easier to handle here: A series of imports
  62. joined by semi-colons, where the first import is a future
  63. statement but some subsequent import has the future form
  64. but is preceded by a regular import.
  65. */
  66. i = 0;
  67. if (_PyAST_GetDocString(mod->v.Module.body) != NULL)
  68. i++;
  69. for (; i < asdl_seq_LEN(mod->v.Module.body); i++) {
  70. stmt_ty s = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i);
  71. if (done && s->lineno > prev_line)
  72. return 1;
  73. prev_line = s->lineno;
  74. /* The tests below will return from this function unless it is
  75. still possible to find a future statement. The only things
  76. that can precede a future statement are another future
  77. statement and a doc string.
  78. */
  79. if (s->kind == ImportFrom_kind) {
  80. identifier modname = s->v.ImportFrom.module;
  81. if (modname &&
  82. _PyUnicode_EqualToASCIIString(modname, "__future__")) {
  83. if (done) {
  84. PyErr_SetString(PyExc_SyntaxError,
  85. ERR_LATE_FUTURE);
  86. PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset);
  87. return 0;
  88. }
  89. if (!future_check_features(ff, s, filename))
  90. return 0;
  91. ff->ff_lineno = s->lineno;
  92. }
  93. else {
  94. done = 1;
  95. }
  96. }
  97. else {
  98. done = 1;
  99. }
  100. }
  101. return 1;
  102. }
  103. PyFutureFeatures *
  104. _PyFuture_FromAST(mod_ty mod, PyObject *filename)
  105. {
  106. PyFutureFeatures *ff;
  107. ff = (PyFutureFeatures *)PyObject_Malloc(sizeof(PyFutureFeatures));
  108. if (ff == NULL) {
  109. PyErr_NoMemory();
  110. return NULL;
  111. }
  112. ff->ff_features = 0;
  113. ff->ff_lineno = -1;
  114. if (!future_parse(ff, mod, filename)) {
  115. PyObject_Free(ff);
  116. return NULL;
  117. }
  118. return ff;
  119. }