Ouch, it's Carlo Verre, not Verre Carlo.

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 37d8b65db64b1cb48046bfb87db0298859658a61..4a9cc50a20de48f4a4a6d471b8c6187126e8990b 100644 (file)
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -3840,21 +3840,21 @@ def proxysuper():
     p = Proxy(obj)
     vereq(C.__dict__["f"](p), "B.f->C.f")
 
-def verrecarlo():
+def carloverre():
     if verbose:
-        print "Testing prohibition of Verre Carlo's hack..."
+        print "Testing prohibition of Carlo Verre's hack..."
     try:
         object.__setattr__(str, "foo", 42)
     except TypeError:
         pass
     else:
-        raise TestFailed, "Verre Carlo __setattr__ suceeded!"
+        raise TestFailed, "Carlo Verre __setattr__ suceeded!"
     try:
         object.__delattr__(str, "lower")
     except TypeError:
         pass
     else:
-        raise TestFailed, "Verre Carlo __delattr__ succeeded!"
+        raise TestFailed, "Carlo Verre __delattr__ succeeded!"
 
 
 def test_main():
@@ -3945,7 +3945,7 @@ def test_main():
     meth_class_get()
     isinst_isclass()
     proxysuper()
-    verrecarlo()
+    carloverre()
 
     if verbose: print "All OK"
 

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 91c40b9999df1632da1b2352c7766fdecb102295..6ef5f757161dd0f32173a1c56561f0a0741b5a3d 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3575,7 +3575,7 @@ wrap_cmpfunc(PyObject *self, PyObject *args, void *wrapped)
 }
 
 /* Helper to check for object.__setattr__ or __delattr__ applied to a type.
-   This is called the Verre Carlo hack after its discoverer. */
+   This is called the Carlo Verre hack after its discoverer. */
 static int
 hackcheck(PyObject *self, setattrofunc func, char *what)
 {