Commit080b6b5

authored

Keep compatibility for subclasses overriding __finalize__ for concat/merge (pandas-dev#63394)

1 parent7b51d3a commit080b6b5Copy full SHA for 080b6b5

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ def _get_result(`
`598`	`598`	`result=sample._constructor_from_mgr(mgr,axes=mgr.axes)`
`599`	`599`	`result._name=name`
`600`	`600`	`returnresult.__finalize__(`
`601`		`-types.SimpleNamespace(input_objs=objs),method="concat"`
	`601`	`+types.SimpleNamespace(input_objs=objs,objs=objs),method="concat"`
`602`	`602`	`)`
`603`	`603`
`604`	`604`	`# combine as columns in a frame`
`@@ -620,7 +620,7 @@ def _get_result(`
`620`	`620`	`df=cons(data,index=index,copy=False)`
`621`	`621`	`df.columns=columns`
`622`	`622`	`returndf.__finalize__(`
`623`		`-types.SimpleNamespace(input_objs=objs),method="concat"`
	`623`	`+types.SimpleNamespace(input_objs=objs,objs=objs),method="concat"`
`624`	`624`	`)`
`625`	`625`
`626`	`626`	`# combine block managers`
`@@ -660,7 +660,9 @@ def _get_result(`
`660`	`660`	`)`
`661`	`661`
`662`	`662`	`out=sample._constructor_from_mgr(new_data,axes=new_data.axes)`
`663`		`-returnout.__finalize__(types.SimpleNamespace(input_objs=objs),method="concat")`
	`663`	`+returnout.__finalize__(`
	`664`	`+types.SimpleNamespace(input_objs=objs,objs=objs),method="concat"`
	`665`	`+ )`
`664`	`666`
`665`	`667`
`666`	`668`	`defnew_axes(`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1150,7 +1150,10 @@ def get_result(self) -> DataFrame:`
`1150`	`1150`	`self._maybe_restore_index_levels(result)`
`1151`	`1151`
`1152`	`1152`	`returnresult.__finalize__(`
`1153`		`-types.SimpleNamespace(input_objs=[self.left,self.right]),method="merge"`
	`1153`	`+types.SimpleNamespace(`
	`1154`	`+input_objs=[self.left,self.right],left=self.left,right=self.right`
	`1155`	`+ ),`
	`1156`	`+method="merge",`
`1154`	`1157`	`)`
`1155`	`1158`
`1156`	`1159`	`@final`

Comments

(0)