summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2006-04-27 23:13:20 (GMT)
committerThomas Wouters <thomas@python.org>2006-04-27 23:13:20 (GMT)
commit9df4e6f6735af274813cf1b611ee1a342955ad63 (patch)
treec0ab6329dd61fc03a46932435828210b3d0d3db8 /Include
parent2c1e63f8a48bf0f530a922219e85443c4e12882d (diff)
downloadcpython-9df4e6f6735af274813cf1b611ee1a342955ad63.zip
cpython-9df4e6f6735af274813cf1b611ee1a342955ad63.tar.gz
cpython-9df4e6f6735af274813cf1b611ee1a342955ad63.tar.bz2
- Add new Warning class, ImportWarning
- Warn-raise ImportWarning when importing would have picked up a directory as package, if only it'd had an __init__.py. This swaps two tests (for case-ness and __init__-ness), but case-test is not really more expensive, and it's not in a speed-critical section. - Test for the new warning by importing a common non-package directory on sys.path: site-packages - In regrtest.py, silence warnings generated by the build-environment because Modules/ (which is added to sys.path for Setup-created modules) has 'zlib' and '_ctypes' directories without __init__.py's.
Diffstat (limited to 'Include')
-rw-r--r--Include/pyerrors.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 1fe2e45..edf3efd 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -108,6 +108,7 @@ PyAPI_DATA(PyObject *) PyExc_SyntaxWarning;
PyAPI_DATA(PyObject *) PyExc_OverflowWarning;
PyAPI_DATA(PyObject *) PyExc_RuntimeWarning;
PyAPI_DATA(PyObject *) PyExc_FutureWarning;
+PyAPI_DATA(PyObject *) PyExc_ImportWarning;
/* Convenience functions */