Mailman 3 April 2011 - Python-checkins

cpython: Updated usage of boolean values.
by vinay.sajip April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/4fad411b4707 changeset: 69722:4fad411b4707 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Apr 30 21:52:26 2011 +0100 summary: Updated usage of boolean values. files: Lib/logging/handlers.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -388,7 +388,7 @@ """ if not os.path.exists(self.baseFilename): stat = None - changed = 1 + changed = True else: stat = os.stat(self.baseFilename) changed = (stat[ST_DEV] != self.dev) or (stat[ST_INO] != self.ino) @@ -418,15 +418,15 @@ """ Initializes the handler with a specific host address and port. - The attribute 'closeOnError' is set to 1 - which means that if - a socket error occurs, the socket is silently closed and then - reopened on the next logging call. + When the attribute *closeOnError* is set to True - if a socket error + occurs, the socket is silently closed and then reopened on the next + logging call. """ logging.Handler.__init__(self) self.host = host self.port = port self.sock = None - self.closeOnError = 0 + self.closeOnError = False self.retryTime = None # # Exponential backoff parameters. @@ -457,7 +457,7 @@ # is the first time back after a disconnect, or # we've waited long enough. if self.retryTime is None: - attempt = 1 + attempt = True else: attempt = (now >= self.retryTime) if attempt: @@ -572,7 +572,7 @@ Initializes the handler with a specific host address and port. """ SocketHandler.__init__(self, host, port) - self.closeOnError = 0 + self.closeOnError = False def makeSocket(self): """ -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Updated usage of boolean values.
by vinay.sajip April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/9078fcce6982 changeset: 69721:9078fcce6982 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Apr 30 21:51:51 2011 +0100 summary: Updated usage of boolean values. files: Lib/logging/__init__.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -688,14 +688,14 @@ Allow filters to be just callables. """ - rv = 1 + rv = True for f in self.filters: if hasattr(f, 'filter'): result = f.filter(record) else: result = f(record) # assume callable - will raise if not if not result: - rv = 0 + rv = False break return rv @@ -1197,9 +1197,9 @@ self.name = name self.level = _checkLevel(level) self.parent = None - self.propagate = 1 + self.propagate = True self.handlers = [] - self.disabled = 0 + self.disabled = False def setLevel(self, level): """ @@ -1567,7 +1567,7 @@ """ Delegate an exception call to the underlying logger. """ - kwargs["exc_info"] = 1 + kwargs["exc_info"] = True self.log(ERROR, msg, *args, **kwargs) def critical(self, msg, *args, **kwargs): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge #11901: post-commit review fixes per Georg Brandl
by r.david.murray April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/ca8e2fe68ecb changeset: 69720:ca8e2fe68ecb parent: 69716:7247d9f2fce9 parent: 69719:591a09cf9e62 user: R David Murray <rdmurray(a)bitdance.com> date: Sat Apr 30 16:36:37 2011 -0400 summary: Merge #11901: post-commit review fixes per Georg Brandl files: Doc/library/sys.rst | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -543,10 +543,10 @@ :term:`struct sequence` :data:`sys.version_info` may be used for a more human-friendly encoding of the same information. - The ``hexversion`` is a 32-bit number with the following layout + The ``hexversion`` is a 32-bit number with the following layout: +-------------------------+------------------------------------------------+ - | bits (big endian order) | meaning | + | Bits (big endian order) | Meaning | +=========================+================================================+ | :const:`1-8` | ``PY_MAJOR_VERSION`` (the ``2`` in | | | ``2.1.0a3``) | @@ -558,14 +558,14 @@ | | ``2.1.0a3``) | +-------------------------+------------------------------------------------+ | :const:`25-28` | ``PY_RELEASE_LEVEL`` (``0xA`` for alpha, | - | | ``0xB`` for beta, ``0xC`` for gamma and | - | | ``0xF`` for final) | + | | ``0xB`` for beta, ``0xC`` for release | + | | candidate and ``0xF`` for final) | +-------------------------+------------------------------------------------+ | :const:`29-32` | ``PY_RELEASE_SERIAL`` (the ``3`` in | - | | ``2.1.0a3``) | + | | ``2.1.0a3``, zero for final releases) | +-------------------------+------------------------------------------------+ - thus ``2.1.0a3`` is hexversion ``0x020100a3`` + Thus ``2.1.0a3`` is hexversion ``0x020100a3``. .. data:: int_info @@ -573,7 +573,7 @@ representation of integers. The attributes are read only. +-------------------------+----------------------------------------------+ - | attribute | explanation | + | Attribute | Explanation | +=========================+==============================================+ | :const:`bits_per_digit` | number of bits held in each digit. Python | | | integers are stored internally in base | -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.1): #11901: post-commit review fixes per Georg Brandl
by r.david.murray April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/2ddb4d6f826a changeset: 69718:2ddb4d6f826a branch: 3.1 parent: 69713:b3e7ffe6d727 user: R David Murray <rdmurray(a)bitdance.com> date: Sat Apr 30 16:35:29 2011 -0400 summary: #11901: post-commit review fixes per Georg Brandl files: Doc/library/sys.rst | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -450,10 +450,10 @@ struct sequence :data:`sys.version_info` may be used for a more human-friendly encoding of the same information. - The ``hexversion`` is a 32-bit number with the following layout + The ``hexversion`` is a 32-bit number with the following layout: +-------------------------+------------------------------------------------+ - | bits (big endian order) | meaning | + | Bits (big endian order) | Meaning | +=========================+================================================+ | :const:`1-8` | ``PY_MAJOR_VERSION`` (the ``2`` in | | | ``2.1.0a3``) | @@ -465,14 +465,14 @@ | | ``2.1.0a3``) | +-------------------------+------------------------------------------------+ | :const:`25-28` | ``PY_RELEASE_LEVEL`` (``0xA`` for alpha, | - | | ``0xB`` for beta, ``0xC`` for gamma and | - | | ``0xF`` for final) | + | | ``0xB`` for beta, ``0xC`` for release | + | | candidate and ``0xF`` for final) | +-------------------------+------------------------------------------------+ | :const:`29-32` | ``PY_RELEASE_SERIAL`` (the ``3`` in | - | | ``2.1.0a3``) | + | | ``2.1.0a3``, zero for final releases) | +-------------------------+------------------------------------------------+ - thus ``2.1.0a3`` is hexversion ``0x020100a3`` + Thus ``2.1.0a3`` is hexversion ``0x020100a3``. .. data:: int_info @@ -480,7 +480,7 @@ internal representation of integers. The attributes are read only. +-------------------------+----------------------------------------------+ - | attribute | explanation | + | Attribute | Explanation | +=========================+==============================================+ | :const:`bits_per_digit` | number of bits held in each digit. Python | | | integers are stored internally in base | -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.1 -> 3.2): Merge #11901: post-commit review fixes per Georg Brandl
by r.david.murray April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/591a09cf9e62 changeset: 69719:591a09cf9e62 branch: 3.2 parent: 69714:6e9aedf6ef24 parent: 69718:2ddb4d6f826a user: R David Murray <rdmurray(a)bitdance.com> date: Sat Apr 30 16:36:08 2011 -0400 summary: Merge #11901: post-commit review fixes per Georg Brandl files: Doc/library/sys.rst | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -552,10 +552,10 @@ struct sequence :data:`sys.version_info` may be used for a more human-friendly encoding of the same information. - The ``hexversion`` is a 32-bit number with the following layout + The ``hexversion`` is a 32-bit number with the following layout: +-------------------------+------------------------------------------------+ - | bits (big endian order) | meaning | + | Bits (big endian order) | Meaning | +=========================+================================================+ | :const:`1-8` | ``PY_MAJOR_VERSION`` (the ``2`` in | | | ``2.1.0a3``) | @@ -567,14 +567,14 @@ | | ``2.1.0a3``) | +-------------------------+------------------------------------------------+ | :const:`25-28` | ``PY_RELEASE_LEVEL`` (``0xA`` for alpha, | - | | ``0xB`` for beta, ``0xC`` for gamma and | - | | ``0xF`` for final) | + | | ``0xB`` for beta, ``0xC`` for release | + | | candidate and ``0xF`` for final) | +-------------------------+------------------------------------------------+ | :const:`29-32` | ``PY_RELEASE_SERIAL`` (the ``3`` in | - | | ``2.1.0a3``) | + | | ``2.1.0a3``, zero for final releases) | +-------------------------+------------------------------------------------+ - thus ``2.1.0a3`` is hexversion ``0x020100a3`` + Thus ``2.1.0a3`` is hexversion ``0x020100a3``. .. data:: int_info @@ -582,7 +582,7 @@ internal representation of integers. The attributes are read only. +-------------------------+----------------------------------------------+ - | attribute | explanation | + | Attribute | Explanation | +=========================+==============================================+ | :const:`bits_per_digit` | number of bits held in each digit. Python | | | integers are stored internally in base | -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #11901: post-commit review fixes per Georg Brandl
by r.david.murray April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/34d2fb56de9a changeset: 69717:34d2fb56de9a branch: 2.7 parent: 69715:fb709d9fe92a user: R David Murray <rdmurray(a)bitdance.com> date: Sat Apr 30 16:34:35 2011 -0400 summary: #11901: post-commit review fixes per Georg Brandl files: Doc/library/sys.rst | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -562,10 +562,10 @@ ``version_info`` value may be used for a more human-friendly encoding of the same information. - The ``hexversion`` is a 32-bit number with the following layout + The ``hexversion`` is a 32-bit number with the following layout: +-------------------------+------------------------------------------------+ - | bits (big endian order) | meaning | + | Bits (big endian order) | Meaning | +=========================+================================================+ | :const:`1-8` | ``PY_MAJOR_VERSION`` (the ``2`` in | | | ``2.1.0a3``) | @@ -577,14 +577,14 @@ | | ``2.1.0a3``) | +-------------------------+------------------------------------------------+ | :const:`25-28` | ``PY_RELEASE_LEVEL`` (``0xA`` for alpha, | - | | ``0xB`` for beta, ``0xC`` for gamma and | - | | ``0xF`` for final) | + | | ``0xB`` for beta, ``0xC`` for release | + | | candidate and ``0xF`` for final) | +-------------------------+------------------------------------------------+ | :const:`29-32` | ``PY_RELEASE_SERIAL`` (the ``3`` in | - | | ``2.1.0a3``) | + | | ``2.1.0a3``, zero for final releases) | +-------------------------+------------------------------------------------+ - thus ``2.1.0a3`` is hexversion ``0x020100a3`` + Thus ``2.1.0a3`` is hexversion ``0x020100a3``. .. versionadded:: 1.5.2 @@ -595,7 +595,7 @@ internal representation of integers. The attributes are read only. +-------------------------+----------------------------------------------+ - | attribute | explanation | + | Attribute | Explanation | +=========================+==============================================+ | :const:`bits_per_digit` | number of bits held in each digit. Python | | | integers are stored internally in base | -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge 3.2
by benjamin.peterson April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/7247d9f2fce9 changeset: 69716:7247d9f2fce9 parent: 69712:fd45c2452be3 parent: 69714:6e9aedf6ef24 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Apr 30 13:16:14 2011 -0500 summary: merge 3.2 files: Doc/c-api/module.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst --- a/Doc/c-api/module.rst +++ b/Doc/c-api/module.rst @@ -221,7 +221,7 @@ .. c:function:: int PyModule_AddIntMacro(PyObject *module, macro) Add an int constant to *module*. The name and the value are taken from - *macro*. For example ``PyModule_AddConstant(module, AF_INET)`` adds the int + *macro*. For example ``PyModule_AddIntMacro(module, AF_INET)`` adds the int constant *AF_INET* with the value of *AF_INET* to *module*. Return ``-1`` on error, ``0`` on success. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): fix function name in example (closes #11966)
by benjamin.peterson April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/fb709d9fe92a changeset: 69715:fb709d9fe92a branch: 2.7 parent: 69704:1a45c92f9716 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Apr 30 13:14:56 2011 -0500 summary: fix function name in example (closes #11966) files: Doc/c-api/module.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst --- a/Doc/c-api/module.rst +++ b/Doc/c-api/module.rst @@ -107,7 +107,7 @@ .. cfunction:: int PyModule_AddIntMacro(PyObject *module, macro) Add an int constant to *module*. The name and the value are taken from - *macro*. For example ``PyModule_AddConstant(module, AF_INET)`` adds the int + *macro*. For example ``PyModule_AddIntMacro(module, AF_INET)`` adds the int constant *AF_INET* with the value of *AF_INET* to *module*. Return ``-1`` on error, ``0`` on success. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.1 -> 3.2): merge 3.1
by benjamin.peterson April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/6e9aedf6ef24 changeset: 69714:6e9aedf6ef24 branch: 3.2 parent: 69708:2caf82aee7a4 parent: 69713:b3e7ffe6d727 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Apr 30 13:15:18 2011 -0500 summary: merge 3.1 files: Doc/c-api/module.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst --- a/Doc/c-api/module.rst +++ b/Doc/c-api/module.rst @@ -205,7 +205,7 @@ .. c:function:: int PyModule_AddIntMacro(PyObject *module, macro) Add an int constant to *module*. The name and the value are taken from - *macro*. For example ``PyModule_AddConstant(module, AF_INET)`` adds the int + *macro*. For example ``PyModule_AddIntMacro(module, AF_INET)`` adds the int constant *AF_INET* with the value of *AF_INET* to *module*. Return ``-1`` on error, ``0`` on success. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.1): fix function name in example (closes #11966)
by benjamin.peterson April 30, 2011

April 30, 2011

http://hg.python.org/cpython/rev/b3e7ffe6d727 changeset: 69713:b3e7ffe6d727 branch: 3.1 parent: 69699:cd68b3031f00 user: Benjamin Peterson <benjamin(a)python.org> date: Sat Apr 30 13:14:56 2011 -0500 summary: fix function name in example (closes #11966) files: Doc/c-api/module.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst --- a/Doc/c-api/module.rst +++ b/Doc/c-api/module.rst @@ -192,7 +192,7 @@ .. cfunction:: int PyModule_AddIntMacro(PyObject *module, macro) Add an int constant to *module*. The name and the value are taken from - *macro*. For example ``PyModule_AddConstant(module, AF_INET)`` adds the int + *macro*. For example ``PyModule_AddIntMacro(module, AF_INET)`` adds the int constant *AF_INET* with the value of *AF_INET* to *module*. Return ``-1`` on error, ``0`` on success. -- Repository URL: http://hg.python.org/cpython

1 0