Commite236fd9

committed

Fix encoding error when printing to redirected output

When redirecting output to a file sys.stdout.encoding is None, so usesys.getdefaultencoding() instead.

1 parent8ce3e30 commite236fd9Copy full SHA for e236fd9

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -445,6 +445,8 @@ def Team(self, id=None, **kwargs):`
`445`	`445`	`"""`
`446`	`446`	`returnself._getListOrObject(Team,id,**kwargs)`
`447`	`447`
	`448`	`+def_get_display_encoding():`
	`449`	`+returnsys.stdout.encodingorsys.getdefaultencoding()`
`448`	`450`
`449`	`451`	`classGitlabObject(object):`
`450`	`452`	`_url=None`
`@@ -574,7 +576,7 @@ def _obj_to_str(obj):`
`574`	`576`	`s=", ".join([GitlabObject._obj_to_str(x)forxinobj])`
`575`	`577`	`return"[ %s ]"%s`
`576`	`578`	`elifisinstance(obj,unicode):`
`577`		`-returnobj.encode(sys.stdout.encoding,"replace")`
	`579`	`+returnobj.encode(_get_display_encoding(),"replace")`
`578`	`580`	`else:`
`579`	`581`	`returnstr(obj)`
`580`	`582`
`@@ -585,8 +587,8 @@ def pretty_print(self, depth=0):`
`585`	`587`	`ifk==self.idAttr:`
`586`	`588`	`continue`
`587`	`589`	`v=self.__dict__[k]`
`588`		`-pretty_k=k.replace('_','-').encode(sys.stdout.encoding,`
`589`		`-"replace")`
	`590`	`+pretty_k=k.replace('_','-')`
	`591`	`+pretty_k=pretty_k.encode(_get_display_encoding(),"replace")`
`590`	`592`	`ifisinstance(v,GitlabObject):`
`591`	`593`	`ifdepth==0:`
`592`	`594`	`print("%s:"%pretty_k)`

Comments

(0)