From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 27 Feb 2006 19:56:30 +0000 (+0000)
Subject: Skip over doc strings.
X-Git-Tag: v2.5a0~512
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=415ed937c21f0d563fb11a20189831b908673462;p=python

Skip over doc strings.
---

diff --git a/Lib/compiler/future.py b/Lib/compiler/future.py
index 868b7cbb52..414e64e888 100644
--- a/Lib/compiler/future.py
+++ b/Lib/compiler/future.py
@@ -22,7 +22,14 @@ class FutureParser:
 
     def visitModule(self, node):
         stmt = node.node
+        found_docstring = False
         for s in stmt.nodes:
+            # Skip over docstrings
+            if not found_docstring and isinstance(s, ast.Discard) \
+               and isinstance(s.expr, ast.Const) \
+               and isinstance(s.expr.value, str):
+                found_docstring = True
+                continue
             if not self.check_stmt(s):
                 break
 
@@ -50,7 +57,7 @@ class BadFutureParser:
             return
         if node.modname != "__future__":
             return
-        raise SyntaxError, "invalid future statement"
+        raise SyntaxError, "invalid future statement " + repr(node)
 
 def find_futures(node):
     p1 = FutureParser()
diff --git a/Misc/NEWS b/Misc/NEWS
index 2791cbe898..164edc8a59 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -393,6 +393,8 @@ Extension Modules
 Library
 -------
 
+- The compiler package now supports future imports after the module docstring.
+
 - Bug #1413790: zipfile now sanitizes absolute archive names that are
   not allowed by the specs.