summaryrefslogtreecommitdiffstats
path: root/Doc/howto
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-11 07:43:25 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-11 07:43:25 (GMT)
commita41fb4be5bd6ecb931f53c86f255e7e9d185bbcb (patch)
tree560fe3d427882d25669b8c8b548cedafaf514fb6 /Doc/howto
parent05cd03aa0dd53bdee72ff3a996873341d0e6ba19 (diff)
parentc9cfcf1e6cd946492be949533de906785d690069 (diff)
downloadcpython-a41fb4be5bd6ecb931f53c86f255e7e9d185bbcb.zip
cpython-a41fb4be5bd6ecb931f53c86f255e7e9d185bbcb.tar.gz
cpython-a41fb4be5bd6ecb931f53c86f255e7e9d185bbcb.tar.bz2
#17351: merge with 3.3.
Diffstat (limited to 'Doc/howto')
-rw-r--r--Doc/howto/logging-cookbook.rst6
-rw-r--r--Doc/howto/sorting.rst2
2 files changed, 4 insertions, 4 deletions
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index e9e56d6..e8d2cdf 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1034,7 +1034,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
@@ -1043,7 +1043,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
@@ -1370,7 +1370,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
index 00bc6f7..f2e64ee 100644
--- 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):