[Python-checkins] r86353 - in python/branches/py3k: Lib/distutils/tests/test_build_ext.py Modules/_testcapimodule.c Objects/weakrefobject.c Python/import.c

[victor.stinner]

Author: victor.stinner
Date: Tue Nov  9 10:32:19 2010
New Revision: 86353

Log:
Issue #10359: Remove ";" after function definition, invalid in ISO C


Modified:
   python/branches/py3k/Lib/distutils/tests/test_build_ext.py
   python/branches/py3k/Modules/_testcapimodule.c
   python/branches/py3k/Objects/weakrefobject.c
   python/branches/py3k/Python/import.c

Modified: python/branches/py3k/Lib/distutils/tests/test_build_ext.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_build_ext.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_build_ext.py	Tue Nov  9 10:32:19 2010
@@ -318,7 +318,7 @@
     def test_get_outputs(self):
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
-        self.write_file(c_file, 'void PyInit_foo(void) {};\n')
+        self.write_file(c_file, 'void PyInit_foo(void) {}\n')
         ext = Extension('foo', [c_file], optional=False)
         dist = Distribution({'name': 'xx',
                              'ext_modules': [ext]})

Modified: python/branches/py3k/Modules/_testcapimodule.c
==============================================================================
--- python/branches/py3k/Modules/_testcapimodule.c	(original)
+++ python/branches/py3k/Modules/_testcapimodule.c	Tue Nov  9 10:32:19 2010
@@ -1792,7 +1792,7 @@
         return NULL;
     }
     Py_RETURN_NONE;
-};
+}
 
 /* This is here to provide a docstring for test_descr. */
 static PyObject *

Modified: python/branches/py3k/Objects/weakrefobject.c
==============================================================================
--- python/branches/py3k/Objects/weakrefobject.c	(original)
+++ python/branches/py3k/Objects/weakrefobject.c	Tue Nov  9 10:32:19 2010
@@ -583,7 +583,7 @@
 }
 
 
-WRAP_METHOD(proxy_bytes, "__bytes__");
+WRAP_METHOD(proxy_bytes, "__bytes__")
 
 
 static PyMethodDef proxy_methods[] = {

Modified: python/branches/py3k/Python/import.c
==============================================================================
--- python/branches/py3k/Python/import.c	(original)
+++ python/branches/py3k/Python/import.c	Tue Nov  9 10:32:19 2010
@@ -3101,7 +3101,7 @@
     buf[3] = (char) ((magic >> 24) & 0xff);
 
     return PyBytes_FromStringAndSize(buf, 4);
-};
+}
 
 static PyObject *
 imp_get_magic(PyObject *self, PyObject *noargs)