#17351: merge with 3.2.

ezio-melotti · ezio-melotti · commit c9cfcf1e6cd9 · 2013-03-11T09:42:40.000+02:00
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
@@ -1036,7 +1036,7 @@ arbitrary object as a message format string, and that the logging package will
 call ``str()`` on that object to get the actual format string. Consider the
 following two classes::
 
-    class BraceMessage(object):
+    class BraceMessage:
         def __init__(self, fmt, *args, **kwargs):
             self.fmt = fmt
             self.args = args
@@ -1045,7 +1045,7 @@ following two classes::
         def __str__(self):
             return self.fmt.format(*self.args, **self.kwargs)
 
-    class DollarMessage(object):
+    class DollarMessage:
         def __init__(self, fmt, **kwargs):
             self.fmt = fmt
             self.kwargs = kwargs
@@ -1372,7 +1372,7 @@ works::
     import random
     import time
 
-    class MyHandler(object):
+    class MyHandler:
         """
         A simple handler for logging events. It runs in the listener process and
         dispatches events to loggers based on the name in the received record,
diff --git a/Doc/howto/sorting.rst b/Doc/howto/sorting.rst
@@ -225,7 +225,7 @@ function. The following wrapper makes that easy to do::
 
     def cmp_to_key(mycmp):
         'Convert a cmp= function into a key= function'
-        class K(object):
+        class K:
             def __init__(self, obj, *args):
                 self.obj = obj
             def __lt__(self, other):
diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
@@ -361,7 +361,7 @@ and maps them to the context management protocol::
 
    from contextlib import contextmanager, ExitStack
 
-   class ResourceManager(object):
+   class ResourceManager:
 
        def __init__(self, acquire_resource, release_resource, check_resource_ok=None):
            self.acquire_resource = acquire_resource
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
@@ -324,7 +324,7 @@ are always available.  They are listed here in alphabetical order.
        '__initializing__', '__loader__', '__name__', '__package__',
        '_clearcache', 'calcsize', 'error', 'pack', 'pack_into',
        'unpack', 'unpack_from']
-      >>> class Shape(object):
+      >>> class Shape:
       ...     def __dir__(self):
       ...         return ['area', 'perimeter', 'location']
       >>> s = Shape()
diff --git a/Doc/library/unittest.mock-examples.rst b/Doc/library/unittest.mock-examples.rst
@@ -45,7 +45,7 @@ the correct arguments.
 This example tests that calling `ProductionClass().method` results in a call to
 the `something` method:
 
-    >>> class ProductionClass(object):
+    >>> class ProductionClass:
     ...     def method(self):
     ...         self.something(1, 2, 3)
     ...     def something(self, a, b, c):
@@ -69,7 +69,7 @@ in the correct way.
 The simple `ProductionClass` below has a `closer` method. If it is called with
 an object then it calls `close` on it.
 
-    >>> class ProductionClass(object):
+    >>> class ProductionClass:
     ...     def closer(self, something):
     ...         something.close()
     ...
@@ -398,7 +398,7 @@ ends:
 Where you use `patch` to create a mock for you, you can get a reference to the
 mock using the "as" form of the with statement:
 
-    >>> class ProductionClass(object):
+    >>> class ProductionClass:
     ...     def method(self):
     ...         pass
     ...
@@ -446,7 +446,7 @@ testable way in the first place...
 
 So, suppose we have some code that looks a little bit like this:
 
-    >>> class Something(object):
+    >>> class Something:
     ...     def __init__(self):
     ...         self.backend = BackendProvider()
     ...     def method(self):
@@ -554,7 +554,7 @@ mock this using a `MagicMock`.
 
 Here's an example class with an "iter" method implemented as a generator:
 
-    >>> class Foo(object):
+    >>> class Foo:
     ...     def iter(self):
     ...         for i in [1, 2, 3]:
     ...             yield i
@@ -664,7 +664,7 @@ function will be turned into a bound method if it is fetched from an instance.
 It will have `self` passed in as the first argument, which is exactly what I
 wanted:
 
-    >>> class Foo(object):
+    >>> class Foo:
     ...   def foo(self):
     ...     pass
     ...
@@ -1183,7 +1183,7 @@ for us.
 You can see in this example how a 'standard' call to `assert_called_with` isn't
 sufficient:
 
-    >>> class Foo(object):
+    >>> class Foo:
     ...     def __init__(self, a, b):
     ...         self.a, self.b = a, b
     ...
@@ -1210,7 +1210,7 @@ A comparison function for our `Foo` class might look something like this:
 And a matcher object that can use comparison functions like this for its
 equality operation would look something like this:
 
-    >>> class Matcher(object):
+    >>> class Matcher:
     ...     def __init__(self, compare, some_obj):
     ...         self.compare = compare
     ...         self.some_obj = some_obj
diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
@@ -695,7 +695,7 @@ have to create a dictionary and unpack it using `**`:
    Fetching a `PropertyMock` instance from an object calls the mock, with
    no args. Setting it calls the mock with the value being set.
 
-        >>> class Foo(object):
+        >>> class Foo:
         ...     @property
         ...     def foo(self):
         ...         return 'something'
@@ -1031,7 +1031,7 @@ can set the `return_value` to be anything you want.
 To configure return values on methods of *instances* on the patched class
 you must do this on the `return_value`. For example:
 
-    >>> class Class(object):
+    >>> class Class:
     ...     def method(self):
     ...         pass
     ...
@@ -1204,7 +1204,7 @@ deleting and either iteration or membership test. This corresponds to the
 magic methods `__getitem__`, `__setitem__`, `__delitem__` and either
 `__iter__` or `__contains__`.
 
-    >>> class Container(object):
+    >>> class Container:
     ...     def __init__(self):
     ...         self.values = {}
     ...     def __getitem__(self, name):
@@ -1378,7 +1378,7 @@ inform the patchers of the different prefix by setting `patch.TEST_PREFIX`:
     >>> value = 3
     >>>
     >>> @patch('__main__.value', 'not three')
-    ... class Thing(object):
+    ... class Thing:
     ...     def foo_one(self):
     ...         print value
     ...     def foo_two(self):
@@ -2137,7 +2137,7 @@ created in the `__init__` method and not to exist on the class at all.
 `autospec` can't know about any dynamically created attributes and restricts
 the api to visible attributes.
 
-    >>> class Something(object):
+    >>> class Something:
     ...   def __init__(self):
     ...     self.a = 33
     ...
@@ -2180,7 +2180,7 @@ class attributes (shared between instances of course) is faster too. e.g.
 
 .. code-block:: python
 
-    class Something(object):
+    class Something:
         a = 33
 
 This brings up another issue. It is relatively common to provide a default
@@ -2191,7 +2191,7 @@ spec, and probably indicates a member that will normally of some other type,
 `autospec` doesn't use a spec for members that are set to `None`. These will
 just be ordinary mocks (well - `MagicMocks`):
 
-    >>> class Something(object):
+    >>> class Something:
     ...     member = None
     ...
     >>> mock = create_autospec(Something)
@@ -2206,7 +2206,7 @@ production class. Both of these require you to use an alternative object as
 the spec. Thankfully `patch` supports this - you can simply pass the
 alternative object as the `autospec` argument:
 
-    >>> class Something(object):
+    >>> class Something:
     ...   def __init__(self):
     ...     self.a = 33
     ...
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -331,6 +331,7 @@ Andrew Eland
 Julien Élie
 Lance Ellinghaus
 Daniel Ellis
+Phil Elson
 David Ely
 Jeff Epler
 Jeff McNeil
