diff -r 6a3e09cd96f3 Doc/library/argparse.rst --- a/Doc/library/argparse.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/argparse.rst Fri Nov 29 12:43:10 2013 +0200 @@ -1476,7 +1476,7 @@ positional arguments * description - description for the sub-parser group in help output, by - default None + default ``None`` * prog - usage information that will be displayed with sub-command help, by default the name of the program and any positional arguments before the @@ -1486,12 +1486,12 @@ default the class of the current parser (e.g. ArgumentParser) * dest - name of the attribute under which sub-command name will be - stored; by default None and no value is stored + stored; by default ``None`` and no value is stored - * help - help for sub-parser group in help output, by default None + * help - help for sub-parser group in help output, by default ``None`` * metavar - string presenting available sub-commands in help; by default it - is None and presents sub-commands in form {cmd1, cmd2, ..} + is ``None`` and presents sub-commands in form {cmd1, cmd2, ..} Some example usage:: diff -r 6a3e09cd96f3 Doc/library/asyncio.rst --- a/Doc/library/asyncio.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/asyncio.rst Fri Nov 29 12:43:10 2013 +0200 @@ -293,10 +293,10 @@ (for example by calling :meth:`write_eof`, if the other end also uses asyncio). - This method may return a false value (including None), in which case + This method may return a false value (including ``None``), in which case the transport will close itself. Conversely, if this method returns a true value, closing the transport is up to the protocol. Since the - default implementation returns None, it implicitly closes the connection. + default implementation returns ``None``, it implicitly closes the connection. .. note:: Some transports such as SSL don't support half-closed connections, diff -r 6a3e09cd96f3 Doc/library/asyncore.rst --- a/Doc/library/asyncore.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/asyncore.rst Fri Nov 29 12:43:10 2013 +0200 @@ -56,7 +56,7 @@ Enter a polling loop that terminates after count passes or all open channels have been closed. All arguments are optional. The *count* - parameter defaults to None, resulting in the loop terminating only when all + parameter defaults to ``None``, resulting in the loop terminating only when all channels have been closed. The *timeout* argument sets the timeout parameter for the appropriate :func:`~select.select` or :func:`~select.poll` call, measured in seconds; the default is 30 seconds. The *use_poll* diff -r 6a3e09cd96f3 Doc/library/bdb.rst --- a/Doc/library/bdb.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/bdb.rst Fri Nov 29 12:43:10 2013 +0200 @@ -241,7 +241,7 @@ .. method:: set_continue() Stop only at breakpoints or when finished. If there are no breakpoints, - set the system trace function to None. + set the system trace function to ``None``. .. method:: set_quit() diff -r 6a3e09cd96f3 Doc/library/dis.rst --- a/Doc/library/dis.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/dis.rst Fri Nov 29 12:43:10 2013 +0200 @@ -54,12 +54,12 @@ :class:`Bytecode` instance yields the bytecode operations as :class:`Instruction` instances. - If *first_line* is not None, it indicates the line number that should + If *first_line* is not ``None``, it indicates the line number that should be reported for the first source line in the disassembled code. Otherwise, the source line information (if any) is taken directly from the disassembled code object. - If *current_offset* is not None, it refers to an instruction offset + If *current_offset* is not ``None``, it refers to an instruction offset in the disassembled code. Setting this means :meth:`dis` will display a "current instruction" marker against the specified opcode. @@ -197,7 +197,7 @@ The iterator generates a series of :class:`Instruction` named tuples giving the details of each operation in the supplied code. - If *first_line* is not None, it indicates the line number that should + If *first_line* is not ``None``, it indicates the line number that should be reported for the first source line in the disassembled code. Otherwise, the source line information (if any) is taken directly from the disassembled code object. @@ -249,7 +249,7 @@ .. data:: arg - numeric argument to operation (if any), otherwise None + numeric argument to operation (if any), otherwise ``None`` .. data:: argval @@ -269,7 +269,7 @@ .. data:: starts_line - line started by this opcode (if any), otherwise None + line started by this opcode (if any), otherwise ``None`` .. data:: is_jump_target diff -r 6a3e09cd96f3 Doc/library/doctest.rst --- a/Doc/library/doctest.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/doctest.rst Fri Nov 29 12:43:10 2013 +0200 @@ -1318,7 +1318,7 @@ not specified, then ``obj.__name__`` is used. The optional parameter *module* is the module that contains the given object. - If the module is not specified or is None, then the test finder will attempt + If the module is not specified or is ``None``, then the test finder will attempt to automatically determine the correct module. The object's module is used: * As a default namespace, if *globs* is not specified. diff -r 6a3e09cd96f3 Doc/library/ensurepip.rst --- a/Doc/library/ensurepip.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/ensurepip.rst Fri Nov 29 12:43:10 2013 +0200 @@ -94,7 +94,7 @@ Bootstraps ``pip`` into the current or designated environment. *root* specifies an alternative root directory to install relative to. - If *root* is None, then installation uses the default install location + If *root* is ``None``, then installation uses the default install location for the current environment. *upgrade* indicates whether or not to upgrade an existing installation diff -r 6a3e09cd96f3 Doc/library/functools.rst --- a/Doc/library/functools.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/functools.rst Fri Nov 29 12:43:10 2013 +0200 @@ -50,7 +50,7 @@ Since a dictionary is used to cache results, the positional and keyword arguments to the function must be hashable. - If *maxsize* is set to None, the LRU feature is disabled and the cache can + If *maxsize* is set to ``None``, the LRU feature is disabled and the cache can grow without bound. The LRU feature performs best when *maxsize* is a power-of-two. diff -r 6a3e09cd96f3 Doc/library/http.server.rst --- a/Doc/library/http.server.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/http.server.rst Fri Nov 29 12:43:10 2013 +0200 @@ -265,7 +265,7 @@ .. method:: date_time_string(timestamp=None) - Returns the date and time given by *timestamp* (which must be None or in + Returns the date and time given by *timestamp* (which must be ``None`` or in the format returned by :func:`time.time`), formatted for a message header. If *timestamp* is omitted, it uses the current date and time. diff -r 6a3e09cd96f3 Doc/library/imaplib.rst --- a/Doc/library/imaplib.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/imaplib.rst Fri Nov 29 12:43:10 2013 +0200 @@ -98,7 +98,7 @@ Parse an IMAP4 ``INTERNALDATE`` string and return corresponding local time. The return value is a :class:`time.struct_time` tuple or - None if the string has wrong format. + ``None`` if the string has wrong format. .. function:: Int2AP(num) diff -r 6a3e09cd96f3 Doc/library/importlib.rst --- a/Doc/library/importlib.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/importlib.rst Fri Nov 29 12:43:10 2013 +0200 @@ -863,7 +863,7 @@ (``__loader__``) The loader to use for loading. For namespace packages this should be - set to None. + set to ``None``. .. attribute:: origin @@ -871,7 +871,7 @@ Name of the place from which the module is loaded, e.g. "builtin" for built-in modules and the filename for modules loaded from source. - Normally "origin" should be set, but it may be None (the default) + Normally "origin" should be set, but it may be ``None`` (the default) which indicates it is unspecified. .. attribute:: submodule_search_locations @@ -884,20 +884,20 @@ .. attribute:: loader_state Container of extra module-specific data for use during loading (or - None). + ``None``). .. attribute:: cached (``__cached__``) - String for where the compiled module should be stored (or None). + String for where the compiled module should be stored (or ``None``). .. attribute:: parent (``__package__``) (Read-only) Fully-qualified name of the package to which the module - belongs as a submodule (or None). + belongs as a submodule (or ``None``). .. attribute:: has_location diff -r 6a3e09cd96f3 Doc/library/json.rst --- a/Doc/library/json.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/json.rst Fri Nov 29 12:43:10 2013 +0200 @@ -382,7 +382,7 @@ (to raise :exc:`TypeError`). If *skipkeys* is ``False`` (the default), then it is a :exc:`TypeError` to - attempt encoding of keys that are not str, int, float or None. If + attempt encoding of keys that are not str, int, float or ``None``. If *skipkeys* is ``True``, such items are simply skipped. If *ensure_ascii* is ``True`` (the default), the output is guaranteed to diff -r 6a3e09cd96f3 Doc/library/logging.config.rst --- a/Doc/library/logging.config.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/logging.config.rst Fri Nov 29 12:43:10 2013 +0200 @@ -137,7 +137,7 @@ across the socket, such that the ``verify`` callable can perform signature verification and/or decryption. The ``verify`` callable is called with a single argument - the bytes received across the socket - and should - return the bytes to be processed, or None to indicate that the bytes should + return the bytes to be processed, or ``None`` to indicate that the bytes should be discarded. The returned bytes could be the same as the passed in bytes (e.g. when only verification is done), or they could be completely different (perhaps if decryption were performed). diff -r 6a3e09cd96f3 Doc/library/logging.rst --- a/Doc/library/logging.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/logging.rst Fri Nov 29 12:43:10 2013 +0200 @@ -1131,7 +1131,7 @@ :lno: The line number in the file where the logging call was made. :msg: The logging message. :args: The arguments for the logging message. - :exc_info: An exception tuple, or None. + :exc_info: An exception tuple, or ``None``. :func: The name of the function or method which invoked the logging call. :sinfo: A stack traceback such as is provided by diff -r 6a3e09cd96f3 Doc/library/multiprocessing.rst --- a/Doc/library/multiprocessing.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/multiprocessing.rst Fri Nov 29 12:43:10 2013 +0200 @@ -1861,7 +1861,7 @@ .. versionadded:: 3.2 *maxtasksperchild* is the number of tasks a worker process can complete before it will exit and be replaced with a fresh worker process, to enable - unused resources to be freed. The default *maxtasksperchild* is None, which + unused resources to be freed. The default *maxtasksperchild* is ``None``, which means worker processes will live as long as the pool. .. versionadded:: 3.4 diff -r 6a3e09cd96f3 Doc/library/nntplib.rst --- a/Doc/library/nntplib.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/nntplib.rst Fri Nov 29 12:43:10 2013 +0200 @@ -216,7 +216,7 @@ .. method:: NNTP.login(user=None, password=None, usenetrc=True) Send ``AUTHINFO`` commands with the user name and password. If *user* - and *password* are None and *usenetrc* is true, credentials from + and *password* are ``None`` and *usenetrc* is true, credentials from ``~/.netrc`` will be used if possible. Unless intentionally delayed, login is normally performed during the diff -r 6a3e09cd96f3 Doc/library/optparse.rst --- a/Doc/library/optparse.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/optparse.rst Fri Nov 29 12:43:10 2013 +0200 @@ -2019,12 +2019,12 @@ values.ensure_value(attr, value) - If the ``attr`` attribute of ``values`` doesn't exist or is None, then + If the ``attr`` attribute of ``values`` doesn't exist or is ``None``, then ensure_value() first sets it to ``value``, and then returns 'value. This is very handy for actions like ``"extend"``, ``"append"``, and ``"count"``, all of which accumulate data in a variable and expect that variable to be of a certain type (a list for the first two, an integer for the latter). Using :meth:`ensure_value` means that scripts using your action don't have to worry about setting a default value for the option destinations in question; they - can just leave the default as None and :meth:`ensure_value` will take care of + can just leave the default as ``None`` and :meth:`ensure_value` will take care of getting it right when it's needed. diff -r 6a3e09cd96f3 Doc/library/os.rst --- a/Doc/library/os.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/os.rst Fri Nov 29 12:43:10 2013 +0200 @@ -212,7 +212,7 @@ executable, similar to a shell, when launching a process. *env*, when specified, should be an environment variable dictionary to lookup the PATH in. - By default, when *env* is None, :data:`environ` is used. + By default, when *env* is ``None``, :data:`environ` is used. .. versionadded:: 3.2 @@ -3250,7 +3250,7 @@ .. function:: cpu_count() - Return the number of CPUs in the system. Returns None if undetermined. + Return the number of CPUs in the system. Returns ``None`` if undetermined. .. versionadded:: 3.4 diff -r 6a3e09cd96f3 Doc/library/queue.rst --- a/Doc/library/queue.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/queue.rst Fri Nov 29 12:43:10 2013 +0200 @@ -101,7 +101,7 @@ .. method:: Queue.put(item, block=True, timeout=None) Put *item* into the queue. If optional args *block* is true and *timeout* is - None (the default), block if necessary until a free slot is available. If + ``None`` (the default), block if necessary until a free slot is available. If *timeout* is a positive number, it blocks at most *timeout* seconds and raises the :exc:`Full` exception if no free slot was available within that time. Otherwise (*block* is false), put an item on the queue if a free slot is @@ -117,7 +117,7 @@ .. method:: Queue.get(block=True, timeout=None) Remove and return an item from the queue. If optional args *block* is true and - *timeout* is None (the default), block if necessary until an item is available. + *timeout* is ``None`` (the default), block if necessary until an item is available. If *timeout* is a positive number, it blocks at most *timeout* seconds and raises the :exc:`Empty` exception if no item was available within that time. Otherwise (*block* is false), return an item if one is immediately available, diff -r 6a3e09cd96f3 Doc/library/select.rst --- a/Doc/library/select.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/select.rst Fri Nov 29 12:43:10 2013 +0200 @@ -429,7 +429,7 @@ Low level interface to kevent - - changelist must be an iterable of kevent object or None + - changelist must be an iterable of kevent object or ``None`` - max_events must be 0 or a positive integer - timeout in seconds (floats possible) diff -r 6a3e09cd96f3 Doc/library/smtplib.rst --- a/Doc/library/smtplib.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/smtplib.rst Fri Nov 29 12:43:10 2013 +0200 @@ -74,7 +74,7 @@ optional, and can contain a PEM formatted private key and certificate chain file for the SSL connection. *context* also optional, can contain a SSLContext, and is an alternative to keyfile and certfile; If it is - specified both keyfile and certfile must be None. The optional *timeout* + specified both keyfile and certfile must be ``None``. The optional *timeout* parameter specifies a timeout in seconds for blocking operations like the connection attempt (if not specified, the global default timeout setting will be used). The optional source_address parameter allows to bind to some @@ -298,8 +298,9 @@ If *keyfile* and *certfile* are provided, these are passed to the :mod:`socket` module's :func:`ssl` function. - Optional *context* parameter is a :class:`ssl.SSLContext` object; This is an alternative to - using a keyfile and a certfile and if specified both *keyfile* and *certfile* should be None. + Optional *context* parameter is a :class:`ssl.SSLContext` object; This is + an alternative to using a keyfile and a certfile and if specified both + *keyfile* and *certfile* should be ``None``. If there has been no previous ``EHLO`` or ``HELO`` command this session, this method tries ESMTP ``EHLO`` first. diff -r 6a3e09cd96f3 Doc/library/sqlite3.rst --- a/Doc/library/sqlite3.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/sqlite3.rst Fri Nov 29 12:43:10 2013 +0200 @@ -321,7 +321,7 @@ as the SQL function. The function can return any of the types supported by SQLite: bytes, str, int, - float and None. + float and ``None``. Example: @@ -337,7 +337,7 @@ final result of the aggregate. The ``finalize`` method can return any of the types supported by SQLite: - bytes, str, int, float and None. + bytes, str, int, float and ``None``. Example: @@ -359,7 +359,7 @@ .. literalinclude:: ../includes/sqlite3/collation_reverse.py - To remove a collation, call ``create_collation`` with None as callable:: + To remove a collation, call ``create_collation`` with ``None`` as callable:: con.create_collation("reverse", None) @@ -870,7 +870,7 @@ (or none at all) via the *isolation_level* parameter to the :func:`connect` call, or via the :attr:`isolation_level` property of connections. -If you want **autocommit mode**, then set :attr:`isolation_level` to None. +If you want **autocommit mode**, then set :attr:`isolation_level` to ``None``. Otherwise leave it at its default, which will result in a plain "BEGIN" statement, or set it to one of SQLite's supported isolation levels: "DEFERRED", diff -r 6a3e09cd96f3 Doc/library/ssl.rst --- a/Doc/library/ssl.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/ssl.rst Fri Nov 29 12:43:10 2013 +0200 @@ -402,8 +402,8 @@ :meth:`SSLContext.set_default_verify_paths`. The return value is a :term:`named tuple` ``DefaultVerifyPaths``: - * :attr:`cafile` - resolved path to cafile or None if the file doesn't exist, - * :attr:`capath` - resolved path to capath or None if the directory doesn't exist, + * :attr:`cafile` - resolved path to cafile or ``None`` if the file doesn't exist, + * :attr:`capath` - resolved path to capath or ``None`` if the directory doesn't exist, * :attr:`openssl_cafile_env` - OpenSSL's environment key that points to a cafile, * :attr:`openssl_cafile` - hard coded path to a cafile, * :attr:`openssl_capath_env` - OpenSSL's environment key that points to a capath, diff -r 6a3e09cd96f3 Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/stdtypes.rst Fri Nov 29 12:43:10 2013 +0200 @@ -1734,13 +1734,13 @@ If there is only one argument, it must be a dictionary mapping Unicode ordinals (integers) or characters (strings of length 1) to Unicode ordinals, - strings (of arbitrary lengths) or None. Character keys will then be + strings (of arbitrary lengths) or ``None``. Character keys will then be converted to ordinals. If there are two arguments, they must be strings of equal length, and in the resulting dictionary, each character in x will be mapped to the character at the same position in y. If there is a third argument, it must be a string, - whose characters will be mapped to None in the result. + whose characters will be mapped to ``None`` in the result. .. method:: str.partition(sep) @@ -2759,7 +2759,7 @@ memory as an N-dimensional array. .. versionchanged:: 3.3 - An empty tuple instead of None when ndim = 0. + An empty tuple instead of ``None`` when ndim = 0. .. attribute:: strides @@ -2767,7 +2767,7 @@ access each element for each dimension of the array. .. versionchanged:: 3.3 - An empty tuple instead of None when ndim = 0. + An empty tuple instead of ``None`` when ndim = 0. .. attribute:: suboffsets diff -r 6a3e09cd96f3 Doc/library/sys.rst --- a/Doc/library/sys.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/sys.rst Fri Nov 29 12:43:10 2013 +0200 @@ -1111,7 +1111,7 @@ .. note:: Under some conditions ``stdin``, ``stdout`` and ``stderr`` as well as the original values ``__stdin__``, ``__stdout__`` and ``__stderr__`` can be - None. It is usually the case for Windows GUI apps that aren't connected + ``None``. It is usually the case for Windows GUI apps that aren't connected to a console and Python apps started with :program:`pythonw`. diff -r 6a3e09cd96f3 Doc/library/test.rst --- a/Doc/library/test.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/test.rst Fri Nov 29 12:43:10 2013 +0200 @@ -395,7 +395,7 @@ A context manager that creates a temporary directory at *path* and yields the directory. - If *path* is None, the temporary directory is created using + If *path* is ``None``, the temporary directory is created using :func:`tempfile.mkdtemp`. If *quiet* is ``False``, the context manager raises an exception on error. Otherwise, if *path* is specified and cannot be created, only a warning is issued. @@ -418,7 +418,7 @@ The context manager creates a temporary directory in the current directory with name *name* before temporarily changing the current - working directory. If *name* is None, the temporary directory is + working directory. If *name* is ``None``, the temporary directory is created using :func:`tempfile.mkdtemp`. If *quiet* is ``False`` and it is not possible to create or change diff -r 6a3e09cd96f3 Doc/library/threading.rst --- a/Doc/library/threading.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/threading.rst Fri Nov 29 12:43:10 2013 +0200 @@ -713,7 +713,7 @@ without an argument would block, return false immediately; otherwise, do the same thing as when called without arguments, and return true. - When invoked with a *timeout* other than None, it will block for at + When invoked with a *timeout* other than ``None``, it will block for at most *timeout* seconds. If acquire does not complete successfully in that interval, return false. Return true otherwise. @@ -853,8 +853,8 @@ Create a timer that will run *function* with arguments *args* and keyword arguments *kwargs*, after *interval* seconds have passed. - If *args* is None (the default) then an empty list will be used. - If *kwargs* is None (the default) then an empty dict will be used. + If *args* is ``None`` (the default) then an empty list will be used. + If *kwargs* is ``None`` (the default) then an empty dict will be used. .. versionchanged:: 3.3 changed from a factory function to a class. diff -r 6a3e09cd96f3 Doc/library/tkinter.ttk.rst --- a/Doc/library/tkinter.ttk.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/tkinter.ttk.rst Fri Nov 29 12:43:10 2013 +0200 @@ -1399,7 +1399,7 @@ Layouts ^^^^^^^ -A layout can be just None, if it takes no options, or a dict of +A layout can be just ``None``, if it takes no options, or a dict of options specifying how to arrange the element. The layout mechanism uses a simplified version of the pack geometry manager: given an initial cavity, each element is allocated a parcel. Valid diff -r 6a3e09cd96f3 Doc/library/turtle.rst --- a/Doc/library/turtle.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/turtle.rst Fri Nov 29 12:43:10 2013 +0200 @@ -544,7 +544,7 @@ :param n: an integer (or ``None``) - Delete all or first/last *n* of turtle's stamps. If *n* is None, delete + Delete all or first/last *n* of turtle's stamps. If *n* is ``None``, delete all stamps, if *n* > 0 delete first *n* stamps, else if *n* < 0 delete last *n* stamps. @@ -1794,7 +1794,7 @@ Pop up a dialog window for input of a string. Parameter title is the title of the dialog window, propmt is a text mostly describing what information to input. - Return the string input. If the dialog is canceled, return None. :: + Return the string input. If the dialog is canceled, return ``None``. :: >>> screen.textinput("NIM", "Name of first player:") @@ -1814,7 +1814,7 @@ The number input must be in the range minval .. maxval if these are given. If not, a hint is issued and the dialog remains open for correction. - Return the number input. If the dialog is canceled, return None. :: + Return the number input. If the dialog is canceled, return ``None``. :: >>> screen.numinput("Poker", "Your stakes:", 1000, minval=10, maxval=10000) @@ -1979,10 +1979,10 @@ :param height: if an integer, the height in pixels, if a float, a fraction of the screen; default is 75% of screen :param startx: if positive, starting position in pixels from the left - edge of the screen, if negative from the right edge, if None, + edge of the screen, if negative from the right edge, if ``None``, center window horizontally :param startx: if positive, starting position in pixels from the top - edge of the screen, if negative from the bottom edge, if None, + edge of the screen, if negative from the bottom edge, if ``None``, center window vertically .. doctest:: diff -r 6a3e09cd96f3 Doc/library/unittest.mock.rst --- a/Doc/library/unittest.mock.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/unittest.mock.rst Fri Nov 29 12:43:10 2013 +0200 @@ -235,7 +235,7 @@ this is a new Mock (created on first access). See the :attr:`return_value` attribute. - * `wraps`: Item for the mock object to wrap. If `wraps` is not None then + * `wraps`: Item for the mock object to wrap. If `wraps` is not ``None`` then calling the Mock will pass the call through to the wrapped object (returning the real result). Attribute access on the mock will return a Mock object that wraps the corresponding attribute of the wrapped diff -r 6a3e09cd96f3 Doc/library/unittest.rst --- a/Doc/library/unittest.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/unittest.rst Fri Nov 29 12:43:10 2013 +0200 @@ -859,7 +859,7 @@ .. method:: assertIsNone(expr, msg=None) assertIsNotNone(expr, msg=None) - Test that *expr* is (or is not) None. + Test that *expr* is (or is not) ``None``. .. versionadded:: 3.1 @@ -1333,7 +1333,7 @@ methods that delegate to it), :meth:`assertDictEqual` and :meth:`assertMultiLineEqual`. - Setting ``maxDiff`` to None means that there is no maximum length of + Setting ``maxDiff`` to ``None`` means that there is no maximum length of diffs. .. versionadded:: 3.2 diff -r 6a3e09cd96f3 Doc/library/urllib.request.rst --- a/Doc/library/urllib.request.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/urllib.request.rst Fri Nov 29 12:43:10 2013 +0200 @@ -427,7 +427,7 @@ .. attribute:: Request.data - The entity body for the request, or None if not specified. + The entity body for the request, or ``None`` if not specified. .. versionchanged:: 3.4 Changing value of :attr:`Request.data` now deletes "Content-Length" diff -r 6a3e09cd96f3 Doc/library/xml.sax.reader.rst --- a/Doc/library/xml.sax.reader.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/library/xml.sax.reader.rst Fri Nov 29 12:43:10 2013 +0200 @@ -303,7 +303,7 @@ Get the byte stream for this input source. The getEncoding method will return the character encoding for this byte stream, - or None if unknown. + or ``None`` if unknown. .. method:: InputSource.setCharacterStream(charfile) diff -r 6a3e09cd96f3 Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/reference/datamodel.rst Fri Nov 29 12:43:10 2013 +0200 @@ -751,7 +751,7 @@ dictionary containing the class's namespace; :attr:`~class.__bases__` is a tuple (possibly empty or a singleton) containing the base classes, in the order of their occurrence in the base class list; :attr:`__doc__` is the - class's documentation string, or None if undefined. + class's documentation string, or ``None`` if undefined. Class instances .. index:: diff -r 6a3e09cd96f3 Doc/whatsnew/3.2.rst --- a/Doc/whatsnew/3.2.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/whatsnew/3.2.rst Fri Nov 29 12:43:10 2013 +0200 @@ -1467,7 +1467,7 @@ syntax. The :func:`ast.literal_eval` function serves as a secure alternative to the builtin :func:`eval` function which is easily abused. Python 3.2 adds :class:`bytes` and :class:`set` literals to the list of supported types: -strings, bytes, numbers, tuples, lists, dicts, sets, booleans, and None. +strings, bytes, numbers, tuples, lists, dicts, sets, booleans, and ``None``. :: diff -r 6a3e09cd96f3 Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/whatsnew/3.3.rst Fri Nov 29 12:43:10 2013 +0200 @@ -182,7 +182,7 @@ * The maximum number of dimensions is officially limited to 64. * The representation of empty shape, strides and suboffsets is now - an empty tuple instead of None. + an empty tuple instead of ``None``. * Accessing a memoryview element with format 'B' (unsigned bytes) now returns an integer (in accordance with the struct module syntax). diff -r 6a3e09cd96f3 Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst Fri Nov 29 12:19:53 2013 +0200 +++ b/Doc/whatsnew/3.4.rst Fri Nov 29 12:43:10 2013 +0200 @@ -122,7 +122,7 @@ * :ref:`PEP 445: Configurable memory allocators ` * :pep:`456` Secure and interchangeable hash algorithm * Improve finalization of Python modules to avoid setting their globals - to None, in most cases (:issue:`18214`). + to ``None``, in most cases (:issue:`18214`). * A more efficient :mod:`marshal` format (:issue:`16475`). * "Argument Clinic", an initial step towards providing improved introspection support for builtin and standard library extension types implemented in C