[Python-checkins] cpython (merge 3.4 -> default): merge
raymond.hettinger
python-checkins at python.org
Sat Mar 29 00:39:59 CET 2014
http://hg.python.org/cpython/rev/c5336d30fd99
changeset: 90014:c5336d30fd99
parent: 90012:c73b71363d4c
parent: 90013:deb71529aad1
user: Raymond Hettinger <python at rcn.com>
date: Fri Mar 28 16:39:45 2014 -0700
summary:
merge
files:
Doc/howto/logging-cookbook.rst | 2 +-
Doc/tutorial/interpreter.rst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -416,7 +416,7 @@
Simple TCP socket-based logging receiver suitable for testing.
"""
- allow_reuse_address = 1
+ allow_reuse_address = True
def __init__(self, host='localhost',
port=logging.handlers.DEFAULT_TCP_LOGGING_PORT,
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -106,7 +106,7 @@
Continuation lines are needed when entering a multi-line construct. As an
example, take a look at this :keyword:`if` statement::
- >>> the_world_is_flat = 1
+ >>> the_world_is_flat = True
>>> if the_world_is_flat:
... print("Be careful not to fall off!")
...
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list