Commitf193ce8

authored and

committed

pythongh-72249: Include the module name in the repr of partial object (pythonGH-101910)

Co-authored-by: Anilyka Barry <vgr255@live.ca>

1 parentd7c6c07 commitf193ce8Copy full SHA for f193ce8

File tree

+27

-18

lines changed

+27

-18

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -303,13 +303,13 @@ def __call__(self, /, args, *keywords):`
`303`	`303`
`304`	`304`	`@recursive_repr()`
`305`	`305`	`def__repr__(self):`
`306`		`-qualname=type(self).__qualname__`
	`306`	`+cls=type(self)`
	`307`	`+qualname=cls.__qualname__`
	`308`	`+module=cls.__module__`
`307`	`309`	`args= [repr(self.func)]`
`308`	`310`	`args.extend(repr(x)forxinself.args)`
`309`	`311`	`args.extend(f"{k}={v!r}"for (k,v)inself.keywords.items())`
`310`		`-iftype(self).__module__=="functools":`
`311`		`-returnf"functools.{qualname}({', '.join(args)})"`
`312`		`-returnf"{qualname}({', '.join(args)})"`
	`312`	`+returnf"{module}.{qualname}({', '.join(args)})"`
`313`	`313`
`314`	`314`	`def__reduce__(self):`
`315`	`315`	`returntype(self), (self.func,), (self.func,self.args,`

Lines changed: 2 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,6 @@`
`31`	`31`
`32`	`32`	`decimal=import_helper.import_fresh_module('decimal',fresh=['_decimal'])`
`33`	`33`
`34`		`-_partial_types= [py_functools.partial]`
`35`		`-ifc_functools:`
`36`		`-_partial_types.append(c_functools.partial)`
`37`		`-`
`38`	`34`
`39`	`35`	`@contextlib.contextmanager`
`40`	`36`	`defreplaced_module(name,replacement):`
`@@ -207,10 +203,7 @@ def test_repr(self):`
`207`	`203`	`kwargs= {'a':object(),'b':object()}`
`208`	`204`	`kwargs_reprs= ['a={a!r}, b={b!r}'.format_map(kwargs),`
`209`	`205`	`'b={b!r}, a={a!r}'.format_map(kwargs)]`
`210`		`-ifself.partialin_partial_types:`
`211`		`-name='functools.partial'`
`212`		`-else:`
`213`		`-name=self.partial.__name__`
	`206`	`+name=f"{self.partial.__module__}.{self.partial.__qualname__}"`
`214`	`207`
`215`	`208`	`f=self.partial(capture)`
`216`	`209`	`self.assertEqual(f'{name}({capture!r})',repr(f))`
`@@ -229,10 +222,7 @@ def test_repr(self):`
`229`	`222`	`forkwargs_reprinkwargs_reprs])`
`230`	`223`
`231`	`224`	`deftest_recursive_repr(self):`
`232`		`-ifself.partialin_partial_types:`
`233`		`-name='functools.partial'`
`234`		`-else:`
`235`		`-name=self.partial.__name__`
	`225`	`+name=f"{self.partial.__module__}.{self.partial.__qualname__}"`
`236`	`226`
`237`	`227`	`f=self.partial(capture)`
`238`	`228`	`f.__setstate__((f, (), {}, {}))`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+:func:`functools.partial`s of :func:`repr` has been improved to include the
	`2`	+:term:`module` name. Patched by Furkan Onder and Anilyka Barry.

Lines changed: 19 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,8 @@ partial_repr(partialobject *pto)`
`365`	`365`	`{`
`366`	`366`	`PyObject*result=NULL;`
`367`	`367`	`PyObject*arglist;`
	`368`	`+PyObject*mod;`
	`369`	`+PyObject*name;`
`368`	`370`	`Py_ssize_ti,n;`
`369`	`371`	`PyObjectkey,value;`
`370`	`372`	`intstatus;`
`@@ -399,13 +401,28 @@ partial_repr(partialobject *pto)`
`399`	`401`	`if (arglist==NULL)`
`400`	`402`	`gotodone;`
`401`	`403`	`}`
`402`		`-result=PyUnicode_FromFormat("%s(%R%U)",Py_TYPE(pto)->tp_name,`
`403`		`-pto->fn,arglist);`
	`404`	`+`
	`405`	`+mod=_PyType_GetModuleName(Py_TYPE(pto));`
	`406`	`+if (mod==NULL) {`
	`407`	`+ gotoerror;`
	`408`	`+ }`
	`409`	`+name=PyType_GetQualName(Py_TYPE(pto));`
	`410`	`+if (name==NULL) {`
	`411`	`+Py_DECREF(mod);`
	`412`	`+ gotoerror;`
	`413`	`+ }`
	`414`	`+result=PyUnicode_FromFormat("%S.%S(%R%U)",mod,name,pto->fn,arglist);`
	`415`	`+Py_DECREF(mod);`
	`416`	`+Py_DECREF(name);`
`404`	`417`	`Py_DECREF(arglist);`
`405`	`418`
`406`	`419`	`done:`
`407`	`420`	`Py_ReprLeave((PyObject*)pto);`
`408`	`421`	`returnresult;`
	`422`	`+error:`
	`423`	`+Py_DECREF(arglist);`
	`424`	`+Py_ReprLeave((PyObject*)pto);`
	`425`	`+returnNULL;`
`409`	`426`	`}`
`410`	`427`
`411`	`428`	`/* Pickle strategy:`

Comments

(0)