summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-08-19 04:25:29 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-08-19 04:25:29 (GMT)
commit8a26706d75aa51b4b5a412892a99686b21331f72 (patch)
tree2c426fbf669772cc151b205d239170318272ecab
parent9b17eba8be14d258a9d4e747b35c3f7ef22f81ca (diff)
downloadcpython-8a26706d75aa51b4b5a412892a99686b21331f72.zip
cpython-8a26706d75aa51b4b5a412892a99686b21331f72.tar.gz
cpython-8a26706d75aa51b4b5a412892a99686b21331f72.tar.bz2
SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro
-rw-r--r--Include/import.h2
-rw-r--r--Misc/NEWS7
2 files changed, 4 insertions, 5 deletions
diff --git a/Include/import.h b/Include/import.h
index a4e5c0e..414e059 100644
--- a/Include/import.h
+++ b/Include/import.h
@@ -22,7 +22,7 @@ PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(char *name,
PyAPI_FUNC(PyObject *) PyImport_ImportModuleEx(
char *name, PyObject *globals, PyObject *locals, PyObject *fromlist);
#define PyImport_ImportModuleEx(n, g, l, f) \
- PyImport_ImportModuleLevel(n, g, l, f, -1);
+ PyImport_ImportModuleLevel(n, g, l, f, -1)
PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
diff --git a/Misc/NEWS b/Misc/NEWS
index 069b714..898f002 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Build
C API
-----
+- Bug #1542693: remove semi-colon at end of PyImport_ImportModuleEx macro
+ so it can be used as an expression.
+
Mac
---
@@ -211,10 +214,6 @@ C API
is always 1 (normal) or 0 (if the specified thread wasn't found).
-Mac
----
-
-
What's New in Python 2.5 beta 3?
================================