Skip to content

Commit 42f908d

Browse files
committed
fix(tests): update pformat/pprint assertions for Py3.15
Python 3.15 changed the default behaviour of pprint.PrettyPrinter: - default indent changed from 1 to 4 - default width changed from 80 to 88 - default compact=False layout now places opening braces/brackets on their own line with contents indented, similar to pretty-printed JSON See: https://docs.python.org/3.15/library/pprint.html (gh-112632)
1 parent 607dddf commit 42f908d

1 file changed

Lines changed: 31 additions & 10 deletions

File tree

tests/unit/base/test_rest_object.py

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import pickle
44

55
import pytest
6+
import sys
67

78
import gitlab
89
from gitlab import base
@@ -222,11 +223,21 @@ def test_pformat(fake_manager):
222223
fake_object = helpers.FakeObject(
223224
fake_manager, {"attr1": "foo" * 10, "ham": "eggs" * 15}
224225
)
225-
assert fake_object.pformat() == (
226-
"<class 'tests.unit.helpers.FakeObject'> => "
227-
"\n{'attr1': 'foofoofoofoofoofoofoofoofoofoo',\n"
228-
" 'ham': 'eggseggseggseggseggseggseggseggseggseggseggseggseggseggseggs'}"
229-
)
226+
if sys.version_info >= (3, 15):
227+
expected = (
228+
"<class 'tests.unit.helpers.FakeObject'> => "
229+
"\n{\n"
230+
" 'attr1': 'foofoofoofoofoofoofoofoofoofoo',\n"
231+
" 'ham': 'eggseggseggseggseggseggseggseggseggseggseggseggseggseggseggs',\n"
232+
"}"
233+
)
234+
else:
235+
expected = (
236+
"<class 'tests.unit.helpers.FakeObject'> => "
237+
"\n{'attr1': 'foofoofoofoofoofoofoofoofoofoo',\n"
238+
" 'ham': 'eggseggseggseggseggseggseggseggseggseggseggseggseggseggseggs'}"
239+
)
240+
assert fake_object.pformat() == expected
230241

231242

232243
def test_pprint(capfd, fake_manager):
@@ -236,11 +247,21 @@ def test_pprint(capfd, fake_manager):
236247
result = fake_object.pprint()
237248
assert result is None
238249
stdout, stderr = capfd.readouterr()
239-
assert stdout == (
240-
"<class 'tests.unit.helpers.FakeObject'> => "
241-
"\n{'attr1': 'foofoofoofoofoofoofoofoofoofoo',\n"
242-
" 'ham': 'eggseggseggseggseggseggseggseggseggseggseggseggseggseggseggs'}\n"
243-
)
250+
if sys.version_info >= (3, 15):
251+
expected = (
252+
"<class 'tests.unit.helpers.FakeObject'> => "
253+
"\n{\n"
254+
" 'attr1': 'foofoofoofoofoofoofoofoofoofoo',\n"
255+
" 'ham': 'eggseggseggseggseggseggseggseggseggseggseggseggseggseggseggs',\n"
256+
"}\n"
257+
)
258+
else:
259+
expected = (
260+
"<class 'tests.unit.helpers.FakeObject'> => "
261+
"\n{'attr1': 'foofoofoofoofoofoofoofoofoofoo',\n"
262+
" 'ham': 'eggseggseggseggseggseggseggseggseggseggseggseggseggseggseggs'}\n"
263+
)
264+
assert stdout == expected
244265
assert stderr == ""
245266

246267

0 commit comments

Comments
 (0)