Small bug fix for indent=1, added to unit test

Author: StefanTodoran

Doc/library/pprint.rst

@@ -36,7 +36,7 @@ Functions
 ---------
 
 .. function:: pp(object, stream=None, indent=1, width=80, depth=None, *, \
-                     compact=False, sort_dicts=False, underscore_numbers=False)
+                     compact=False, sort_dicts=False, underscore_numbers=False, block_style=False)
 
    Prints the formatted representation of *object*, followed by a newline.
    This function may be used in the interactive interpreter
@@ -85,6 +85,12 @@ Functions
       integers will be formatted with the ``_`` character for a thousands separator,
       otherwise underscores are not displayed (the default).
 
+   :param bool block_style:
+      If ``True``,
+      opening parentheses and brackets will be followed by a newline and the
+      following content will be indented by one level, similar to block style
+      JSON formatting. This option is not compatible with *compact*.
+
    >>> import pprint
    >>> stuff = ['spam', 'eggs', 'lumberjack', 'knights', 'ni']
    >>> stuff.insert(0, stuff)
@@ -100,18 +106,18 @@ Functions
 
 
 .. function:: pprint(object, stream=None, indent=1, width=80, depth=None, *, \
-                     compact=False, sort_dicts=True, underscore_numbers=False)
+                     compact=False, sort_dicts=True, underscore_numbers=False, block_style=False)
 
    Alias for :func:`~pprint.pp` with *sort_dicts* set to ``True`` by default,
    which would automatically sort the dictionaries' keys,
    you might want to use :func:`~pprint.pp` instead where it is ``False`` by default.
 
 
 .. function:: pformat(object, indent=1, width=80, depth=None, *, \
-                      compact=False, sort_dicts=True, underscore_numbers=False)
+                      compact=False, sort_dicts=True, underscore_numbers=False, block_style=False)
 
    Return the formatted representation of *object* as a string.  *indent*,
-   *width*, *depth*, *compact*, *sort_dicts* and *underscore_numbers* are
+   *width*, *depth*, *compact*, *sort_dicts*, *underscore_numbers* and *block_style* are
    passed to the :class:`PrettyPrinter` constructor as formatting parameters
    and their meanings are as described in the documentation above.
 
@@ -155,7 +161,7 @@ PrettyPrinter Objects
 .. index:: single: ...; placeholder
 
 .. class:: PrettyPrinter(indent=1, width=80, depth=None, stream=None, *, \
-                         compact=False, sort_dicts=True, underscore_numbers=False)
+                         compact=False, sort_dicts=True, underscore_numbers=False, block_style=False)
 
    Construct a :class:`PrettyPrinter` instance.
 
@@ -179,6 +185,22 @@ PrettyPrinter Objects
      'knights', 'ni'],
     'spam', 'eggs', 'lumberjack', 'knights',
     'ni']
+   >>> pp = pprint.PrettyPrinter(width=41, block_style=True, indent=3)
+   >>> pp.pprint(stuff)
+   [
+      [
+         'spam',
+         'eggs',
+         'lumberjack',
+         'knights',
+         'ni'
+      ],
+      'spam',
+      'eggs',
+      'lumberjack',
+      'knights',
+      'ni'
+   ]
    >>> tup = ('spam', ('eggs', ('lumberjack', ('knights', ('ni', ('dead',
    ... ('parrot', ('fresh fruit',))))))))
    >>> pp = pprint.PrettyPrinter(depth=6)
@@ -198,6 +220,9 @@ PrettyPrinter Objects
    .. versionchanged:: 3.11
       No longer attempts to write to :data:`!sys.stdout` if it is ``None``.
 
+   .. versionchanged:: 3.13
+      Added the *block_style* parameter.
+
 
 :class:`PrettyPrinter` instances have the following methods:
 
@@ -420,3 +445,72 @@ cannot be split, the specified width will be exceeded::
     'requires_python': None,
     'summary': 'A sample Python project',
     'version': '1.2.0'}
+
+Lastly, we can achieve block style formatting with the *block_style* parameter. Best results
+are achieved with a higher *indent* value::
+
+   >>> pprint.pp(project_info, indent=4, block_style=True)
+   {
+      'author': 'The Python Packaging Authority',
+      'author_email': '[email protected]',
+      'bugtrack_url': None,
+      'classifiers': [
+         'Development Status :: 3 - Alpha',
+         'Intended Audience :: Developers',
+         'License :: OSI Approved :: MIT License',
+         'Programming Language :: Python :: 2',
+         'Programming Language :: Python :: 2.6',
+         'Programming Language :: Python :: 2.7',
+         'Programming Language :: Python :: 3',
+         'Programming Language :: Python :: 3.2',
+         'Programming Language :: Python :: 3.3',
+         'Programming Language :: Python :: 3.4',
+         'Topic :: Software Development :: Build Tools'
+      ],
+      'description': 'A sample Python project\n'
+      '=======================\n'
+      '\n'
+      'This is the description file for the project.\n'
+      '\n'
+      'The file should use UTF-8 encoding and be written using ReStructured '
+      'Text. It\n'
+      'will be used to generate the project webpage on PyPI, and should be '
+      'written for\n'
+      'that purpose.\n'
+      '\n'
+      'Typical contents for this file would include an overview of the project, '
+      'basic\n'
+      'usage examples, etc. Generally, including the project changelog in here '
+      'is not\n'
+      'a good idea, although a simple "What\'s New" section for the most recent '
+      'version\n'
+      'may be appropriate.',
+      'description_content_type': None,
+      'docs_url': None,
+      'download_url': 'UNKNOWN',
+      'downloads': {'last_day': -1, 'last_month': -1, 'last_week': -1},
+      'dynamic': None,
+      'home_page': 'https://github.com/pypa/sampleproject',
+      'keywords': 'sample setuptools development',
+      'license': 'MIT',
+      'license_expression': None,
+      'license_files': None,
+      'maintainer': None,
+      'maintainer_email': None,
+      'name': 'sampleproject',
+      'package_url': 'https://pypi.org/project/sampleproject/',
+      'platform': 'UNKNOWN',
+      'project_url': 'https://pypi.org/project/sampleproject/',
+      'project_urls': {
+         'Download': 'UNKNOWN',
+         'Homepage': 'https://github.com/pypa/sampleproject'
+      },
+      'provides_extra': None,
+      'release_url': 'https://pypi.org/project/sampleproject/1.2.0/',
+      'requires_dist': None,
+      'requires_python': None,
+      'summary': 'A sample Python project',
+      'version': '1.2.0',
+      'yanked': False,
+      'yanked_reason': None
+   }

Lib/pprint.py

@@ -218,7 +218,7 @@ def _format_block_start(self, start_str, indent):
             return start_str +'\n' + ' ' * indent
         else:
             return start_str
-    
+
     def _format_block_end(self, end_str, indent):
         if self._block_style:
             return '\n' + ' ' * indent + end_str
@@ -243,9 +243,10 @@ def _pprint_dataclass(self, object, stream, indent, allowance, context, level):
     def _pprint_dict(self, object, stream, indent, allowance, context, level):
         write = stream.write
         write(self._format_block_start('{', indent))
-        if self._indent_per_level > 1:
-            indent_adjust = 0 if self._block_style else -1
-            write((self._indent_per_level + indent_adjust) * ' ')
+        if self._indent_per_level > 1 and not self._block_style:
+            write((self._indent_per_level - 1) * ' ')
+        if self._indent_per_level > 0 and self._block_style:
+            write(self._indent_per_level * ' ')
         length = len(object)
         if length:
             if self._sort_dicts:
@@ -387,7 +388,8 @@ def _pprint_bytes(self, object, stream, indent, allowance, context, level):
     def _pprint_bytearray(self, object, stream, indent, allowance, context, level):
         write = stream.write
         write(self._format_block_start('bytearray(', indent))
-        write(' ' * self._indent_per_level)
+        if self._block_style:
+            write(' ' * self._indent_per_level)
         recursive_indent = indent + 10 if not self._block_style else indent + self._indent_per_level
         self._pprint_bytes(bytes(object), stream, recursive_indent,
                            allowance + 1, context, level + 1)
@@ -460,9 +462,10 @@ def _format_namespace_items(self, items, stream, indent, allowance, context, lev
     def _format_items(self, items, stream, indent, allowance, context, level):
         write = stream.write
         indent += self._indent_per_level
-        if self._indent_per_level > 1:
-            indent_adjust = 0 if self._block_style else -1
-            write((self._indent_per_level + indent_adjust) * ' ')
+        if self._indent_per_level > 1 and not self._block_style:
+            write((self._indent_per_level - 1) * ' ')
+        if self._indent_per_level > 0 and self._block_style:
+            write(self._indent_per_level * ' ')
         delimnl = ',\n' + ' ' * indent
         delim = ''
         width = max_width = self._width - indent + 1
@@ -537,8 +540,10 @@ def _pprint_counter(self, object, stream, indent, allowance, context, level):
             return
         cls = object.__class__
         stream.write(self._format_block_start(cls.__name__ + '({', indent))
-        if self._indent_per_level > 1:
+        if self._indent_per_level > 1 and not self._block_style:
             stream.write((self._indent_per_level - 1) * ' ')
+        if self._indent_per_level > 0 and self._block_style:
+            stream.write(self._indent_per_level * ' ')
         items = object.most_common()
         recursive_indent = indent + len(cls.__name__) + 1 if not self._block_style else indent
         self._format_dict_items(items, stream,