cpython-lru_cache-weakref: Python/future.c annotate

annotate Python/future.c @ 40582:67287ca4e1e8

Merged revisions 53005-53303 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r53012 | walter.doerwald | 2006-12-12 22:55:31 +0100 (Tue, 12 Dec 2006) | 2 lines Fix typo. ........ r53023 | brett.cannon | 2006-12-13 23:31:37 +0100 (Wed, 13 Dec 2006) | 2 lines Remove an unneeded import of 'warnings'. ........ r53025 | brett.cannon | 2006-12-14 00:02:38 +0100 (Thu, 14 Dec 2006) | 2 lines Remove unneeded imports of 'warnings'. ........ r53026 | brett.cannon | 2006-12-14 00:09:53 +0100 (Thu, 14 Dec 2006) | 4 lines Add test.test_support.guard_warnings_filter . This function returns a context manager that protects warnings.filter from being modified once the context is exited. ........ r53029 | george.yoshida | 2006-12-14 03:22:44 +0100 (Thu, 14 Dec 2006) | 2 lines Note that guard_warnings_filter was added in 2.6 ........ r53031 | vinay.sajip | 2006-12-14 09:53:55 +0100 (Thu, 14 Dec 2006) | 1 line Added news on recent changes to logging ........ r53032 | andrew.kuchling | 2006-12-14 19:57:53 +0100 (Thu, 14 Dec 2006) | 1 line [Patch #1599256 from David Watson] check that os.fsync is available before using it ........ r53042 | kurt.kaiser | 2006-12-15 06:13:11 +0100 (Fri, 15 Dec 2006) | 6 lines 1. Avoid hang when encountering a duplicate in a completion list. Bug 1571112. 2. Duplicate some old entries from Python's NEWS to IDLE's NEWS.txt M AutoCompleteWindow.py M NEWS.txt ........ r53048 | andrew.kuchling | 2006-12-18 18:12:31 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1618083] Add missing word; make a few grammar fixes ........ r53050 | andrew.kuchling | 2006-12-18 18:16:05 +0100 (Mon, 18 Dec 2006) | 1 line Bump version ........ r53051 | andrew.kuchling | 2006-12-18 18:22:07 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1616726] Fix description of generator.close(); if you raise some random exception, the exception is raised and doesn't trigger a RuntimeError ........ r53052 | andrew.kuchling | 2006-12-18 18:38:14 +0100 (Mon, 18 Dec 2006) | 1 line Describe new methods in Queue module ........ r53053 | andrew.kuchling | 2006-12-18 20:22:24 +0100 (Mon, 18 Dec 2006) | 1 line [Patch #1615868 by Lars Gustaebel] Use Py_off_t to fix BZ2File.seek() for offsets > 2Gb ........ r53057 | andrew.kuchling | 2006-12-18 22:29:07 +0100 (Mon, 18 Dec 2006) | 1 line Fix markup ........ r53063 | thomas.wouters | 2006-12-19 09:17:50 +0100 (Tue, 19 Dec 2006) | 5 lines Make sre's SubPattern objects accept slice objects like it already accepts simple slices. ........ r53065 | andrew.kuchling | 2006-12-19 15:13:05 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1618455 by Ben Maurer] Improve speed of HMAC by using str.translate() instead of a more general XOR that has to construct a list. Slightly modified from Maurer's patch: the _strxor() function is no longer necessary at all. ........ r53066 | andrew.kuchling | 2006-12-19 15:28:23 +0100 (Tue, 19 Dec 2006) | 9 lines [Bug #1613651] Document socket.recv_into, socket.recvfrom_into Also, the text for recvfrom told you to read recv() for an explanation of the 'flags' argument, but recv() just pointed you at the man page. Copied the man-page text to recvfrom(), recvfrom_into, recv_into to avoid the pointless redirection. I don't have LaTeX on this machine; hope my markup is OK. ........ r53067 | andrew.kuchling | 2006-12-19 15:29:04 +0100 (Tue, 19 Dec 2006) | 1 line Comment typo ........ r53068 | andrew.kuchling | 2006-12-19 16:11:41 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1617413 from Dug Song] Fix HTTP Basic authentication via HTTPS ........ r53071 | andrew.kuchling | 2006-12-19 16:18:12 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1600491 from Jim Jewett] Describe how to build help files on Windows ........ r53073 | andrew.kuchling | 2006-12-19 16:43:10 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1587139 by kxroberto] Protect lock acquisition/release with try...finally to ensure the lock is always released. This could use the 'with' statement, but the patch uses 'finally'. 2.5 backport candidate. ........ r53074 | vinay.sajip | 2006-12-19 19:29:11 +0100 (Tue, 19 Dec 2006) | 1 line Updated documentation for findCaller() to indicate that a 3-tuple is now returned, rather than a 2-tuple. ........ r53090 | georg.brandl | 2006-12-19 23:06:46 +0100 (Tue, 19 Dec 2006) | 3 lines Patch #1484695: The tarfile module now raises a HeaderError exception if a buffer given to frombuf() is invalid. ........ r53099 | raymond.hettinger | 2006-12-20 07:42:06 +0100 (Wed, 20 Dec 2006) | 5 lines Bug #1590891: random.randrange don't return correct value for big number Needs to be backported. ........ r53106 | georg.brandl | 2006-12-20 12:55:16 +0100 (Wed, 20 Dec 2006) | 3 lines Testcase for patch #1484695. ........ r53110 | andrew.kuchling | 2006-12-20 20:48:20 +0100 (Wed, 20 Dec 2006) | 17 lines [Apply length-checking.diff from bug #1599254] Add length checking to single-file mailbox formats: before doing a flush() on a mailbox, seek to the end and verify its length is unchanged, raising ExternalClashError if the file's length has changed. This fix avoids potential data loss if some other process appends to the mailbox file after the table of contents has been generated; instead of overwriting the modified file, you'll get the exception. I also noticed that the self._lookup() call in self.flush() wasn't necessary (everything that sets self._pending to True also calls self.lookup()), and replaced it by an assertion. 2.5 backport candidate. ........ r53112 | andrew.kuchling | 2006-12-20 20:57:10 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619674] Make sum() use the term iterable, not sequence ........ r53113 | andrew.kuchling | 2006-12-20 20:58:11 +0100 (Wed, 20 Dec 2006) | 1 line Two grammar fixes ........ r53115 | andrew.kuchling | 2006-12-20 21:11:12 +0100 (Wed, 20 Dec 2006) | 5 lines Some other built-in functions are described with 'sequence' arguments that should really be 'iterable'; this commit changes them. Did I miss any? Did I introduce any errors? ........ r53117 | andrew.kuchling | 2006-12-20 21:20:42 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619680] in_dll() arguments are documented in the wrong order ........ r53120 | neal.norwitz | 2006-12-21 05:38:00 +0100 (Thu, 21 Dec 2006) | 1 line Lars asked for permission on on python-dev for work on tarfile.py ........ r53125 | andrew.kuchling | 2006-12-21 14:40:29 +0100 (Thu, 21 Dec 2006) | 1 line Mention the os.SEEK_* constants ........ r53129 | walter.doerwald | 2006-12-21 19:06:30 +0100 (Thu, 21 Dec 2006) | 2 lines Fix typo. ........ r53131 | thomas.heller | 2006-12-21 19:30:56 +0100 (Thu, 21 Dec 2006) | 3 lines Fix wrong markup of an argument in a method signature. Will backport. ........ r53137 | andrew.kuchling | 2006-12-22 01:50:56 +0100 (Fri, 22 Dec 2006) | 1 line Typo fix ........ r53139 | andrew.kuchling | 2006-12-22 14:25:02 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #737202; fix from Titus Brown] Make CGIHTTPServer work for scripts in sub-directories ........ r53141 | andrew.kuchling | 2006-12-22 16:04:45 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128] Make the mode argument of dumbdbm actually work the way it's described, and add a test for it. 2.5 bugfix candidate, maybe; arguably this patch changes the API of dumbdbm and shouldn't be added in a point-release. ........ r53142 | andrew.kuchling | 2006-12-22 16:16:58 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128 continued] Modify mode depending on the process umask. Is there really no other way to read the umask than to set it? Hope this works on Windows... ........ r53145 | andrew.kuchling | 2006-12-22 17:43:26 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #776202] Apply Walter Doerwald's patch to use text mode for encoded files ........ r53146 | andrew.kuchling | 2006-12-22 19:41:42 +0100 (Fri, 22 Dec 2006) | 9 lines [Patch #783050 from Patrick Lynch] The emulation of forkpty() is incorrect; the master should close the slave fd. Added a test to test_pty.py that reads from the master_fd after doing a pty.fork(); without the fix it hangs forever instead of raising an exception. (<crossing fingers for the buildbots>) 2.5 backport candidate. ........ r53147 | andrew.kuchling | 2006-12-22 20:06:16 +0100 (Fri, 22 Dec 2006) | 1 line [Patch #827559 from Chris Gonnerman] Make SimpleHTTPServer redirect when a directory URL is missing the trailing slash; this lets relative links work. ........ r53149 | andrew.kuchling | 2006-12-22 20:21:27 +0100 (Fri, 22 Dec 2006) | 1 line Darn; this test works when you run test_pty.py directly, but fails when regrtest runs it (the os.read() raises os.error). I can't figure out the cause, so am commenting out the test. ........ r53150 | andrew.kuchling | 2006-12-22 22:48:19 +0100 (Fri, 22 Dec 2006) | 1 line Frak; this test also fails ........ r53153 | lars.gustaebel | 2006-12-23 17:40:13 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1230446: tarfile.py: fix ExFileObject so that read() and tell() work correctly together with readline(). Will backport to 2.5. ........ r53155 | lars.gustaebel | 2006-12-23 18:57:23 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1262036: Prevent TarFiles from being added to themselves under certain conditions. Will backport to 2.5. ........ r53159 | andrew.kuchling | 2006-12-27 04:25:31 +0100 (Wed, 27 Dec 2006) | 4 lines [Part of patch #1182394] Move the HMAC blocksize to be a class-level constant; this allows changing it in a subclass. To accommodate this, copy() now uses __class__. Also add some text to a comment. ........ r53160 | andrew.kuchling | 2006-12-27 04:31:24 +0100 (Wed, 27 Dec 2006) | 1 line [Rest of patch #1182394] Add ._current() method so that we can use the written-in-C .hexdigest() method ........ r53161 | lars.gustaebel | 2006-12-27 11:30:46 +0100 (Wed, 27 Dec 2006) | 4 lines Patch #1504073: Fix tarfile.open() for mode "r" with a fileobj argument. Will backport to 2.5. ........ r53165 | neal.norwitz | 2006-12-28 05:39:20 +0100 (Thu, 28 Dec 2006) | 1 line Remove a stray (old) macro name left around (I guess) ........ r53188 | neal.norwitz | 2006-12-29 04:01:53 +0100 (Fri, 29 Dec 2006) | 1 line SF bug #1623890, fix argument name in docstring ........ r53200 | raymond.hettinger | 2006-12-30 05:01:17 +0100 (Sat, 30 Dec 2006) | 1 line For sets with cyclical reprs, emit an ellipsis instead of infinitely recursing. ........ r53232 | brett.cannon | 2007-01-04 01:23:49 +0100 (Thu, 04 Jan 2007) | 3 lines Add EnvironmentVarGuard to test.test_support. Provides a context manager to temporarily set or unset environment variables. ........ r53235 | neal.norwitz | 2007-01-04 07:25:31 +0100 (Thu, 04 Jan 2007) | 1 line SF #1627373, fix typo in CarbonEvt. ........ r53244 | raymond.hettinger | 2007-01-04 18:53:34 +0100 (Thu, 04 Jan 2007) | 1 line Fix stability of heapq's nlargest() and nsmallest(). ........ r53249 | martin.v.loewis | 2007-01-04 22:06:12 +0100 (Thu, 04 Jan 2007) | 3 lines Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, to avoid relying on atexit. Will backport to 2.5. ........ r53252 | gregory.p.smith | 2007-01-05 02:59:42 +0100 (Fri, 05 Jan 2007) | 3 lines Support linking of the bsddb module against BerkeleyDB 4.5.x (will backport to 2.5) ........ r53253 | gregory.p.smith | 2007-01-05 03:06:17 +0100 (Fri, 05 Jan 2007) | 2 lines bump module version to match supported berkeleydb version ........ r53255 | neal.norwitz | 2007-01-05 06:25:22 +0100 (Fri, 05 Jan 2007) | 6 lines Prevent crash on shutdown which can occur if we are finalizing and the module dict has been cleared already and some object raises a warning (like in a __del__). Will backport. ........ r53258 | gregory.p.smith | 2007-01-05 08:21:35 +0100 (Fri, 05 Jan 2007) | 2 lines typo fix ........ r53260 | neal.norwitz | 2007-01-05 09:06:43 +0100 (Fri, 05 Jan 2007) | 1 line Add Collin Winter for access to update PEP 3107 ........ r53262 | andrew.kuchling | 2007-01-05 15:22:17 +0100 (Fri, 05 Jan 2007) | 1 line [Bug #1622533] Make docstrings raw strings because they contain control characters (\0, \1) ........ r53264 | andrew.kuchling | 2007-01-05 16:51:24 +0100 (Fri, 05 Jan 2007) | 1 line [Patch #1520904] Fix bsddb tests to write to the temp directory instead of the Lib/bsddb/test directory ........ r53279 | brett.cannon | 2007-01-05 22:45:09 +0100 (Fri, 05 Jan 2007) | 3 lines Silence a warning from gcc 4.0.1 by specifying a function's parameter list is 'void' instead of just a set of empty parentheses. ........ r53285 | raymond.hettinger | 2007-01-06 02:14:41 +0100 (Sat, 06 Jan 2007) | 2 lines SF# 1409443: Expand comment to cover the interaction between f->f_lasti and the PREDICT macros. ........ r53286 | anthony.baxter | 2007-01-06 05:45:54 +0100 (Sat, 06 Jan 2007) | 1 line update to (c) years to include 2007 ........ r53291 | neal.norwitz | 2007-01-06 22:24:35 +0100 (Sat, 06 Jan 2007) | 1 line Add Josiah to SF for maintaining asyncore/asynchat ........ r53293 | peter.astrand | 2007-01-07 09:53:46 +0100 (Sun, 07 Jan 2007) | 1 line Re-implemented fix for #1531862 once again, in a way that works with Python 2.2. Fixes bug #1603424. ........ r53295 | peter.astrand | 2007-01-07 15:34:16 +0100 (Sun, 07 Jan 2007) | 1 line Avoid O(N**2) bottleneck in _communicate_(). Fixes #1598181. ........ r53300 | raymond.hettinger | 2007-01-08 19:09:20 +0100 (Mon, 08 Jan 2007) | 1 line Fix zero-length corner case for iterating over a mutating deque. ........ r53301 | vinay.sajip | 2007-01-08 19:50:32 +0100 (Mon, 08 Jan 2007) | 4 lines Bare except clause removed from SMTPHandler.emit(). Now, only ImportError is trapped. Bare except clause removed from SocketHandler.createSocket(). Now, only socket.error is trapped. (SF #411881) ........ r53302 | vinay.sajip | 2007-01-08 19:51:46 +0100 (Mon, 08 Jan 2007) | 2 lines Bare except clause removed from LogRecord.__init__. Now, only ValueError, TypeError and AttributeError are trapped. (SF #411881) ........ r53303 | vinay.sajip | 2007-01-08 19:52:36 +0100 (Mon, 08 Jan 2007) | 1 line Added entries about removal of some bare except clauses from logging. ........

author	Thomas Wouters <thomas@python.org>
date	Tue, 09 Jan 2007 23:18:33 +0000
parents	654c380cf8b9
children	cd125fe83051

rev	line source
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	1 #include "Python.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	2 #include "Python-ast.h"
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	3 #include "node.h"
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	4 #include "token.h"
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	5 #include "graminit.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	6 #include "code.h"
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	7 #include "compile.h"
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	8 #include "symtable.h"
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	9
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	10 #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined"
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	11
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	12 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	13 future_check_features(PyFutureFeatures ff, stmt_ty s, const char filename)
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	14 {
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	15 int i;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	16 asdl_seq *names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	17
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	18 assert(s->kind == ImportFrom_kind);
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	19
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	20 names = s->v.ImportFrom.names;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	21 for (i = 0; i < asdl_seq_LEN(names); i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	22 alias_ty name = (alias_ty)asdl_seq_GET(names, i);
35992 c0c12aa757e7 Reduce scope of feature Neal Norwitz <nnorwitz@gmail.com> parents: 35991 diff changeset	23 const char *feature = PyString_AsString(name->name);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	24 if (!feature)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	25 return 0;
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	26 if (strcmp(feature, FUTURE_NESTED_SCOPES) == 0) {
19158 97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19051 diff changeset	27 continue;
18609 59446d0f8341 Preliminary support for "from __future__ import generators" to enable Guido van Rossum <guido@python.org> parents: 17018 diff changeset	28 } else if (strcmp(feature, FUTURE_GENERATORS) == 0) {
22968 ba0236f84318 Removed more hair in support of future-generator stmts. Tim Peters <tim.peters@gmail.com> parents: 19407 diff changeset	29 continue;
19051 f20727cc3d0f Implement PEP 238 in its (almost) full glory. Guido van Rossum <guido@python.org> parents: 18612 diff changeset	30 } else if (strcmp(feature, FUTURE_DIVISION) == 0) {
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36726 diff changeset	31 continue;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	32 } else if (strcmp(feature, FUTURE_ABSOLUTE_IMPORT) == 0) {
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36726 diff changeset	33 continue;
36726 bbf16fd024df from __future__ import with_statement addon for 'with', mostly written by Thomas Wouters <thomas@python.org> parents: 36712 diff changeset	34 } else if (strcmp(feature, FUTURE_WITH_STATEMENT) == 0) {
36988 49c6eb688906 Checkpoint. 218 tests are okay; 53 are failing. Done so far: Guido van Rossum <guido@python.org> parents: 36726 diff changeset	35 continue;
16838 09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 16824 diff changeset	36 } else if (strcmp(feature, "braces") == 0) {
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 16824 diff changeset	37 PyErr_SetString(PyExc_SyntaxError,
09f6c1372056 Improve SyntaxErrors for bad future statements. Set file and location Jeremy Hylton <jeremy@alum.mit.edu> parents: 16824 diff changeset	38 "not a chance");
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	39 PyErr_SyntaxLocation(filename, s->lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	40 return 0;
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	41 } else {
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	42 PyErr_Format(PyExc_SyntaxError,
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	43 UNDEFINED_FUTURE_FEATURE, feature);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	44 PyErr_SyntaxLocation(filename, s->lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	45 return 0;
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	46 }
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	47 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	48 return 1;
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	49 }
acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	50
35862 6867995a18a7 Prevent name pollution by making lots of internal functions static. Neal Norwitz <nnorwitz@gmail.com> parents: 35742 diff changeset	51 static int
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	52 future_parse(PyFutureFeatures ff, mod_ty mod, const char filename)
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	53 {
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	54 int i, found_docstring = 0, done = 0, prev_line = 0;
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	55
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	56 static PyObject *future;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	57 if (!future) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	58 future = PyString_InternFromString("__future__");
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	59 if (!future)
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	60 return 0;
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	61 }
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	62
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	63 if (!(mod->kind == Module_kind \|\| mod->kind == Interactive_kind))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	64 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	65
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	66 /* A subsequent pass will detect future imports that don't
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	67 appear at the beginning of the file. There's one case,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	68 however, that is easier to handl here: A series of imports
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	69 joined by semi-colons, where the first import is a future
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	70 statement but some subsequent import has the future form
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	71 but is preceded by a regular import.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	72 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	73
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	74
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	75 for (i = 0; i < asdl_seq_LEN(mod->v.Module.body); i++) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	76 stmt_ty s = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i);
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	77
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	78 if (done && s->lineno > prev_line)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	79 return 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	80 prev_line = s->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	81
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	82 /* The tests below will return from this function unless it is
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	83 still possible to find a future statement. The only things
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	84 that can precede a future statement are another future
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	85 statement and a doc string.
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	86 */
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	87
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	88 if (s->kind == ImportFrom_kind) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	89 if (s->v.ImportFrom.module == future) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	90 if (done) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	91 PyErr_SetString(PyExc_SyntaxError,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	92 ERR_LATE_FUTURE);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	93 PyErr_SyntaxLocation(filename,
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	94 s->lineno);
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	95 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	96 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	97 if (!future_check_features(ff, s, filename))
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	98 return 0;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	99 ff->ff_lineno = s->lineno;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	100 }
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	101 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	102 done = 1;
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	103 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	104 else if (s->kind == Expr_kind && !found_docstring) {
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	105 expr_ty e = s->v.Expr.value;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	106 if (e->kind != Str_kind)
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	107 done = 1;
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	108 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	109 found_docstring = 1;
16823 acbe74f3a786 Presumed correct compiler pass for future statements Jeremy Hylton <jeremy@alum.mit.edu> parents: 16799 diff changeset	110 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	111 else
1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	112 done = 1;
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	113 }
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	114 return 1;
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	115 }
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	116
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	117
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	118 PyFutureFeatures *
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	119 PyFuture_FromAST(mod_ty mod, const char *filename)
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	120 {
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	121 PyFutureFeatures *ff;
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	122
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	123 ff = (PyFutureFeatures *)PyObject_Malloc(sizeof(PyFutureFeatures));
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	124 if (ff == NULL) {
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	125 PyErr_NoMemory();
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	126 return NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	127 }
19158 97a3d3d7029f Refactor future feature handling Jeremy Hylton <jeremy@alum.mit.edu> parents: 19051 diff changeset	128 ff->ff_features = 0;
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	129 ff->ff_lineno = -1;
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	130
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 34539 diff changeset	131 if (!future_parse(ff, mod, filename)) {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36988 diff changeset	132 PyObject_Free(ff);
16799 08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	133 return NULL;
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	134 }
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	135 return ff;
08d937107fe6 Improved __future__ parser; still more to do Jeremy Hylton <jeremy@alum.mit.edu> parents: diff changeset	136 }

Mercurial > cpython-lru_cache-weakref

annotate Python/future.c @ 40582:67287ca4e1e8