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.

161 lines
4.9 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
13 years ago
13 years ago
14 years ago
  1. #include "Python.h"
  2. #include "Python-ast.h"
  3. #include "node.h"
  4. #include "token.h"
  5. #include "graminit.h"
  6. #include "code.h"
  7. #include "symtable.h"
  8. #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined"
  9. #define ERR_LATE_FUTURE \
  10. "from __future__ imports must occur at the beginning of the file"
  11. static int
  12. future_check_features(PyFutureFeatures *ff, stmt_ty s, PyObject *filename)
  13. {
  14. int i;
  15. asdl_seq *names;
  16. assert(s->kind == ImportFrom_kind);
  17. names = s->v.ImportFrom.names;
  18. for (i = 0; i < asdl_seq_LEN(names); i++) {
  19. alias_ty name = (alias_ty)asdl_seq_GET(names, i);
  20. const char *feature = _PyUnicode_AsString(name->name);
  21. if (!feature)
  22. return 0;
  23. if (strcmp(feature, FUTURE_NESTED_SCOPES) == 0) {
  24. continue;
  25. } else if (strcmp(feature, FUTURE_GENERATORS) == 0) {
  26. continue;
  27. } else if (strcmp(feature, FUTURE_DIVISION) == 0) {
  28. continue;
  29. } else if (strcmp(feature, FUTURE_ABSOLUTE_IMPORT) == 0) {
  30. continue;
  31. } else if (strcmp(feature, FUTURE_WITH_STATEMENT) == 0) {
  32. continue;
  33. } else if (strcmp(feature, FUTURE_PRINT_FUNCTION) == 0) {
  34. continue;
  35. } else if (strcmp(feature, FUTURE_UNICODE_LITERALS) == 0) {
  36. continue;
  37. } else if (strcmp(feature, FUTURE_BARRY_AS_BDFL) == 0) {
  38. ff->ff_features |= CO_FUTURE_BARRY_AS_BDFL;
  39. } else if (strcmp(feature, FUTURE_GENERATOR_STOP) == 0) {
  40. ff->ff_features |= CO_FUTURE_GENERATOR_STOP;
  41. } else if (strcmp(feature, "braces") == 0) {
  42. PyErr_SetString(PyExc_SyntaxError,
  43. "not a chance");
  44. PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset);
  45. return 0;
  46. } else {
  47. PyErr_Format(PyExc_SyntaxError,
  48. UNDEFINED_FUTURE_FEATURE, feature);
  49. PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset);
  50. return 0;
  51. }
  52. }
  53. return 1;
  54. }
  55. static int
  56. future_parse(PyFutureFeatures *ff, mod_ty mod, PyObject *filename)
  57. {
  58. int i, done = 0, prev_line = 0;
  59. stmt_ty first;
  60. if (!(mod->kind == Module_kind || mod->kind == Interactive_kind))
  61. return 1;
  62. if (asdl_seq_LEN(mod->v.Module.body) == 0)
  63. return 1;
  64. /* A subsequent pass will detect future imports that don't
  65. appear at the beginning of the file. There's one case,
  66. however, that is easier to handle here: A series of imports
  67. joined by semi-colons, where the first import is a future
  68. statement but some subsequent import has the future form
  69. but is preceded by a regular import.
  70. */
  71. i = 0;
  72. first = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i);
  73. if (first->kind == Expr_kind
  74. && (first->v.Expr.value->kind == Str_kind
  75. || (first->v.Expr.value->kind == Constant_kind
  76. && PyUnicode_CheckExact(first->v.Expr.value->v.Constant.value))))
  77. i++;
  78. for (; i < asdl_seq_LEN(mod->v.Module.body); i++) {
  79. stmt_ty s = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i);
  80. if (done && s->lineno > prev_line)
  81. return 1;
  82. prev_line = s->lineno;
  83. /* The tests below will return from this function unless it is
  84. still possible to find a future statement. The only things
  85. that can precede a future statement are another future
  86. statement and a doc string.
  87. */
  88. if (s->kind == ImportFrom_kind) {
  89. identifier modname = s->v.ImportFrom.module;
  90. if (modname &&
  91. !PyUnicode_CompareWithASCIIString(modname, "__future__")) {
  92. if (done) {
  93. PyErr_SetString(PyExc_SyntaxError,
  94. ERR_LATE_FUTURE);
  95. PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset);
  96. return 0;
  97. }
  98. if (!future_check_features(ff, s, filename))
  99. return 0;
  100. ff->ff_lineno = s->lineno;
  101. }
  102. else {
  103. done = 1;
  104. }
  105. }
  106. else {
  107. done = 1;
  108. }
  109. }
  110. return 1;
  111. }
  112. PyFutureFeatures *
  113. PyFuture_FromASTObject(mod_ty mod, PyObject *filename)
  114. {
  115. PyFutureFeatures *ff;
  116. ff = (PyFutureFeatures *)PyObject_Malloc(sizeof(PyFutureFeatures));
  117. if (ff == NULL) {
  118. PyErr_NoMemory();
  119. return NULL;
  120. }
  121. ff->ff_features = 0;
  122. ff->ff_lineno = -1;
  123. if (!future_parse(ff, mod, filename)) {
  124. PyObject_Free(ff);
  125. return NULL;
  126. }
  127. return ff;
  128. }
  129. PyFutureFeatures *
  130. PyFuture_FromAST(mod_ty mod, const char *filename_str)
  131. {
  132. PyFutureFeatures *ff;
  133. PyObject *filename;
  134. filename = PyUnicode_DecodeFSDefault(filename_str);
  135. if (filename == NULL)
  136. return NULL;
  137. ff = PyFuture_FromASTObject(mod, filename);
  138. Py_DECREF(filename);
  139. return ff;
  140. }