python · donBarbos · Jan 25, 2025 · Feb 6, 2025 · Feb 6, 2025 · Feb 7, 2025
diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst
@@ -36,7 +36,8 @@ Functions
 ---------
 
 .. function:: pp(object, stream=None, indent=1, width=80, depth=None, *, \
-                     compact=False, sort_dicts=False, underscore_numbers=False, block_style=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
@@ -106,15 +107,17 @@ Functions
 
 
 .. function:: pprint(object, stream=None, indent=1, width=80, depth=None, *, \
-                     compact=False, sort_dicts=True, underscore_numbers=False, block_style=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, block_style=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*, *underscore_numbers* and *block_style* are
@@ -161,7 +164,8 @@ PrettyPrinter Objects
 .. index:: single: ...; placeholder
 
 .. class:: PrettyPrinter(indent=1, width=80, depth=None, stream=None, *, \
-                         compact=False, sort_dicts=True, underscore_numbers=False, block_style=False)
+                         compact=False, sort_dicts=True, \
+                         underscore_numbers=False, block_style=False)
 
    Construct a :class:`PrettyPrinter` instance.
 
@@ -446,8 +450,8 @@ cannot be split, the specified width will be exceeded::
     '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::
+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)
    {

diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
@@ -894,7 +894,7 @@ pprint
 * Add a *block_style* keyword argument for :func:`pprint.pprint`,
   :func:`pprint.pformat`, :func:`pprint.pp`. If true, the output will be
   formatted in a block style similar to pretty-printed :func:`json.dumps` when
-  *indent* is supplied. Incompatible with *compact* mode.
+  *indent* is supplied.
   (Contributed by Stefan Todoran in :gh:`129274`.)
 
 
@@ -1210,7 +1210,7 @@ Deprecated
 .. include:: ../deprecations/pending-removal-in-future.rst
 
 Removed
-=======
+========
 
 argparse
 --------

diff --git a/Lib/pprint.py b/Lib/pprint.py
@@ -44,7 +44,8 @@
 
 
 def pprint(object, stream=None, indent=1, width=80, depth=None, *,
-           compact=False, sort_dicts=True, underscore_numbers=False, block_style=False):
+           compact=False, sort_dicts=True, underscore_numbers=False,
+           block_style=False):
     """Pretty-print a Python object to a stream [default is sys.stdout]."""
     printer = PrettyPrinter(
         stream=stream, indent=indent, width=width, depth=depth,
@@ -54,11 +55,13 @@ def pprint(object, stream=None, indent=1, width=80, depth=None, *,
 
 
 def pformat(object, indent=1, width=80, depth=None, *,
-            compact=False, sort_dicts=True, underscore_numbers=False, block_style=False):
+            compact=False, sort_dicts=True, underscore_numbers=False,
+            block_style=False):
     """Format a Python object into a pretty-printed representation."""
     return PrettyPrinter(indent=indent, width=width, depth=depth,
                          compact=compact, sort_dicts=sort_dicts,
-                         underscore_numbers=underscore_numbers, block_style=block_style).pformat(object)
+                         underscore_numbers=underscore_numbers,
+                         block_style=block_style).pformat(object)
 
 
 def pp(object, *args, sort_dicts=False, **kwargs):
@@ -111,7 +114,8 @@ def _safe_tuple(t):
 
 class PrettyPrinter:
     def __init__(self, indent=1, width=80, depth=None, stream=None, *,
-                 compact=False, sort_dicts=True, underscore_numbers=False, block_style=False):
+                 compact=False, sort_dicts=True, underscore_numbers=False,
+                 block_style=False):
         """Handle pretty printing operations onto a stream using a set of
         configured parameters.
 
@@ -215,13 +219,13 @@ def _format(self, object, stream, indent, allowance, context, level):
 
     def _format_block_start(self, start_str, indent):
         if self._block_style:
-            return start_str +'\n' + ' ' * indent
+            return f"{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
+            return f"\n{' ' * indent}{end_str}"
         else:
             return end_str
 

diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py
@@ -10,14 +10,6 @@
 import re
 import types
 import unittest
-from collections import OrderedDict
-from collections import defaultdict
-from collections import Counter
-from collections import ChainMap
-from collections import deque
-from collections import UserDict, UserList
-from dataclasses import dataclass, field
-from types import SimpleNamespace, MappingProxyType
 
 # list, tuple and dict subclasses that do or don't overwrite __repr__
 class list2(list):
@@ -1133,13 +1125,13 @@ def test_user_string(self):
     'lazy dog'}""")
 
     def test_block_style_dataclass(self):
-        @dataclass
+        @dataclasses.dataclass
         class DummyDataclass:
             foo: str
             bar: float
             baz: bool
-            qux: dict = field(default_factory=dict)
-            quux: list = field(default_factory=list)
+            qux: dict = dataclasses.field(default_factory=dict)
+            quux: list = dataclasses.field(default_factory=list)
             corge: int = 1
             garply: tuple = (1, 2, 3, 4)
         dummy_dataclass = DummyDataclass(
@@ -1182,7 +1174,7 @@ def test_block_style_dict(self):
 }""")
 
     def test_block_style_ordered_dict(self):
-        dummy_ordered_dict = OrderedDict(
+        dummy_ordered_dict = collections.OrderedDict(
             [
                 ("foo", 1),
                 ("bar", 12),
@@ -1302,7 +1294,7 @@ def test_block_style_mappingproxy(self):
             "quux": ["foo", "bar", "baz"],
             "corge": 7,
         }
-        dummy_mappingproxy = MappingProxyType(dummy_dict)
+        dummy_mappingproxy = types.MappingProxyType(dummy_dict)
         self.assertEqual(pprint.pformat(dummy_mappingproxy, width=40, indent=4, block_style=True),
 """\
 mappingproxy({
@@ -1314,10 +1306,10 @@ def test_block_style_mappingproxy(self):
 })""")
 
     def test_block_style_namespace(self):
-        dummy_namespace = SimpleNamespace(
+        dummy_namespace = types.SimpleNamespace(
             foo="bar",
             bar=42,
-            baz=SimpleNamespace(
+            baz=types.SimpleNamespace(
                 x=321,
                 y="string",
                 d={"foo": True, "bar": "baz"},
@@ -1337,7 +1329,7 @@ def test_block_style_namespace(self):
 )""")
 
     def test_block_style_defaultdict(self):
-        dummy_defaultdict = defaultdict(list)
+        dummy_defaultdict = collections.defaultdict(list)
         dummy_defaultdict["foo"].append("bar")
         dummy_defaultdict["foo"].append("baz")
         dummy_defaultdict["foo"].append("qux")
@@ -1350,7 +1342,7 @@ def test_block_style_defaultdict(self):
 })""")
 
     def test_block_style_counter(self):
-        dummy_counter = Counter("abcdeabcdabcaba")
+        dummy_counter = collections.Counter("abcdeabcdabcaba")
         expected = """\
 Counter({
     'a': 5,
@@ -1379,7 +1371,7 @@ def test_block_style_chainmap(self):
             "quux": ["foo", "bar", "baz"],
             "corge": 7,
         }
-        dummy_chainmap = ChainMap(
+        dummy_chainmap = collections.ChainMap(
             {"foo": "bar"},
             {"baz": "qux"},
             {"corge": dummy_dict},
@@ -1421,7 +1413,7 @@ def test_block_style_deque(self):
         dummy_set = {
             (1, 2, 3),
         }
-        dummy_deque = deque(maxlen=10)
+        dummy_deque = collections.deque(maxlen=10)
         dummy_deque.append("foo")
         dummy_deque.append(123)
         dummy_deque.append(dummy_dict)
@@ -1446,21 +1438,16 @@ def test_block_style_deque(self):
 ], maxlen=10)""")
 
     def test_block_style_userdict(self):
-        class DummyUserDict(UserDict):
+        class DummyUserDict(collections.UserDict):
             """A custom UserDict with some extra attributes"""
 
             def __init__(self, *args, **kwargs):
                 super().__init__(*args, **kwargs)
                 self.access_count = 0
-        dummy_userdict = DummyUserDict(
-            {
-                "foo": "bar",
-                "baz": 123,
-                "qux": {"foo": "bar", "baz": 123},
-                "quux": ["foo", "bar", "baz"],
-                "corge": 7,
-            }
-        )
+        dummy_userdict = DummyUserDict({ "foo": "bar", "baz": 123,
+                                        "qux": {"foo": "bar", "baz": 123},
+                                        "quux": ["foo", "bar", "baz"],
+                                        "corge": 7 })
         dummy_userdict.access_count = 5
 
         self.assertEqual(pprint.pformat(dummy_userdict, width=40, indent=4, block_style=True),
@@ -1474,13 +1461,14 @@ def __init__(self, *args, **kwargs):
 }""")
 
     def test_block_style_userlist(self):
-        class DummyUserList(UserList):
+        class DummyUserList(collections.UserList):
             """A custom UserList with some extra attributes"""
 
             def __init__(self, *args, **kwargs):
                 super().__init__(*args, **kwargs)
                 self.description = "foo"
-        dummy_userlist = DummyUserList(["first", 2, {"key": "value"}, [4, 5, 6]])
+        dummy_userlist = DummyUserList(["first", 2, {"key": "value"},
+                                       [4, 5, 6]])
 
         self.assertEqual(pprint.pformat(dummy_userlist, width=40, indent=4, block_style=True),
 """\