Commit 4600cfe3 authored by Martin v. Löwis's avatar Martin v. Löwis

Patch #1677862: Require a space or tab after import in .pth files.

parent 35468b81
...@@ -28,12 +28,17 @@ the newly added path for configuration files. ...@@ -28,12 +28,17 @@ the newly added path for configuration files.
A path configuration file is a file whose name has the form A path configuration file is a file whose name has the form
\file{\var{package}.pth} and exists in one of the four directories \file{\var{package}.pth} and exists in one of the four directories
mentioned above; its contents are additional items (one mentioned above; its contents are additional items (one per line) to
per line) to be added to \code{sys.path}. Non-existing items are be added to \code{sys.path}. Non-existing items are never added to
never added to \code{sys.path}, but no check is made that the item \code{sys.path}, but no check is made that the item refers to a
refers to a directory (rather than a file). No item is added to directory (rather than a file). No item is added to \code{sys.path}
\code{sys.path} more than once. Blank lines and lines beginning with more than once. Blank lines and lines beginning with \code{\#} are
\code{\#} are skipped. Lines starting with \code{import} are executed. skipped. Lines starting with \code{import} (followed by space or tab)
are executed.
\versionchanged[A space or tab is now required after the import
keyword]{2.6}
\index{package} \index{package}
\indexiii{path}{configuration}{file} \indexiii{path}{configuration}{file}
......
...@@ -134,7 +134,7 @@ def addpackage(sitedir, name, known_paths): ...@@ -134,7 +134,7 @@ def addpackage(sitedir, name, known_paths):
for line in f: for line in f:
if line.startswith("#"): if line.startswith("#"):
continue continue
if line.startswith("import"): if line.startswith("import ") or line.startswith("import\t"):
exec line exec line
continue continue
line = line.rstrip() line = line.rstrip()
......
...@@ -158,6 +158,8 @@ Core and builtins ...@@ -158,6 +158,8 @@ Core and builtins
Library Library
------- -------
- Patch #1677862: Require a space or tab after import in .pth files.
- Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap - Patch #1192590: Fix pdb's "ignore" and "condition" commands so they trap
the IndexError caused by passing in an invalid breakpoint number. the IndexError caused by passing in an invalid breakpoint number.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment