Commit2d1382f

committed

fix: support int forparent_id inimport_group

This will also fix other use cases where an integer is passed in toMultipartEncoder.Added unit tests to show it works.Closes:#2506

1 parent27c33b5 commit2d1382fCopy full SHA for 2d1382f

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ def prepare_send_data(`
`75`	`75`	`ifTYPE_CHECKING:`
`76`	`76`	`assertisinstance(post_data,dict)`
`77`	`77`	`fork,vinpost_data.items():`
`78`		`-ifisinstance(v,bool):`
	`78`	`+ifisinstance(v,(bool,int)):`
`79`	`79`	`post_data[k]=str(int(v))`
`80`	`80`	`post_data["file"]=files.get("file")`
`81`	`81`	`post_data["avatar"]=files.get("avatar")`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ def import_group(`
`378`	`378`	`file:BinaryIO,`
`379`	`379`	`path:str,`
`380`	`380`	`name:str,`
`381`		`-parent_id:Optional[str]=None,`
	`381`	`+parent_id:Optional[Union[int,str]]=None,`
`382`	`382`	`**kwargs:Any,`
`383`	`383`	`)->Union[Dict[str,Any],requests.Response]:`
`384`	`384`	`"""Import a group from an archive file.`
`@@ -399,7 +399,7 @@ def import_group(`
`399`	`399`	`A representation of the import status.`
`400`	`400`	`"""`
`401`	`401`	`files= {"file": ("file.tar.gz",file,"application/octet-stream")}`
`402`		`-data= {"path":path,"name":name}`
	`402`	`+data:Dict[str,Any]= {"path":path,"name":name}`
`403`	`403`	`ifparent_idisnotNone:`
`404`	`404`	`data["parent_id"]=parent_id`
`405`	`405`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,3 +36,15 @@ def test_prepare_send_data_str_parentid(self) -> None:`
`36`	`36`	`assertresult.jsonisNone`
`37`	`37`	`assertresult.content_type.startswith("multipart/form-data")`
`38`	`38`	`assertisinstance(result.data,MultipartEncoder)`
	`39`	`+`
	`40`	`+deftest_prepare_send_data_int_parentid(self)->None:`
	`41`	`+file="12345"`
	`42`	`+files= {"file": ("file.tar.gz",file,"application/octet-stream")}`
	`43`	`+post_data= {"parent_id":12}`
	`44`	`+`
	`45`	`+result=requests_backend.RequestsBackend.prepare_send_data(`
	`46`	`+files=files,post_data=post_data,raw=False`
	`47`	`+ )`
	`48`	`+assertresult.jsonisNone`
	`49`	`+assertresult.content_type.startswith("multipart/form-data")`
	`50`	`+assertisinstance(result.data,MultipartEncoder)`

Comments

(0)