Commitdf2fb54

committed

PY2,#519: FIX GitCommandError.tostr() encoding issue

+ PY3 means "PY3 or later" (TODO: fix also for *gitdb* project).

1 parent25a2ebf commitdf2fb54Copy full SHA for df2fb54

File tree

+22

-14

lines changed

+22

-14

lines changed

Lines changed: 15 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`importsys`
`12`	`12`
`13`	`13`	`fromgitdb.utils.compatimport (`
`14`		`-PY3,`
`15`	`14`	`xrange,`
`16`	`15`	`MAXSIZE,`
`17`	`16`	`izip,`
`@@ -24,7 +23,9 @@`
`24`	`23`	`force_text`
`25`	`24`	`)`
`26`	`25`
	`26`	`+PY3=sys.version_info[0]>=3`
`27`	`27`	`defenc=sys.getdefaultencoding()`
	`28`	`+`
`28`	`29`	`ifPY3:`
`29`	`30`	`importio`
`30`	`31`	`FileType=io.IOBase`
`@@ -74,13 +75,8 @@ def __new__(cls, name, nbases, d):`
`74`	`75`	`# we set the __metaclass__ attribute explicitly`
`75`	`76`	`ifnotPY3and'___metaclass__'notind:`
`76`	`77`	`d['__metaclass__']=meta`
`77`		`-# end`
`78`	`78`	`returnmeta(name,bases,d)`
`79`		`-# end`
`80`		`-# end metaclass`
`81`	`79`	`returnmetaclass(meta.__name__+'Helper',None, {})`
`82`		`-# end handle py2`
`83`		`-`
`84`	`80`
`85`	`81`	`defis_win():`
`86`	`82`	`returnos.name=='nt'`
`@@ -93,3 +89,16 @@ def is_posix():`
`93`	`89`	`defis_darwin():`
`94`	`90`	`returnos.name=='darwin'`
`95`	`91`
	`92`	`+`
	`93`	`+## From https://docs.python.org/3.3/howto/pyporting.html`
	`94`	`+classUnicodeMixin(object):`
	`95`	`+`
	`96`	`+"""Mixin class to handle defining the proper __str__/__unicode__`
	`97`	`+ methods in Python 2 or 3."""`
	`98`	`+`
	`99`	`+ifsys.version_info[0]>=3:# Python 3`
	`100`	`+def__str__(self):`
	`101`	`+returnself.__unicode__()`
	`102`	`+else:# Python 2`
	`103`	`+def__str__(self):`
	`104`	`+returnself.__unicode__().encode('utf8')`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@`
`6`	`6`	`""" Module containing all exceptions thrown througout the git package, """`
`7`	`7`
`8`	`8`	`fromgitdb.excimport*# NOQA`
`9`		`-`
`10`		`-fromgit.compatimportdefenc`
	`9`	`+fromgit.compatimportUnicodeMixin,safe_decode`
`11`	`10`
`12`	`11`
`13`	`12`	`classInvalidGitRepositoryError(Exception):`
`@@ -28,7 +27,7 @@ class GitCommandNotFound(Exception):`
`28`	`27`	`pass`
`29`	`28`
`30`	`29`
`31`		`-classGitCommandError(Exception):`
	`30`	`+classGitCommandError(UnicodeMixin,Exception):`
`32`	`31`	`""" Thrown if execution of the git command fails with non-zero status code. """`
`33`	`32`
`34`	`33`	`def__init__(self,command,status,stderr=None,stdout=None):`
`@@ -37,13 +36,13 @@ def __init__(self, command, status, stderr=None, stdout=None):`
`37`	`36`	`self.status=status`
`38`	`37`	`self.command=command`
`39`	`38`
`40`		`-def__str__(self):`
`41`		`-ret="'%s' returned with exit code %i"% \`
`42`		`- (' '.join(str(i)foriinself.command),self.status)`
	`39`	`+def__unicode__(self):`
	`40`	`+ret=u"'%s' returned with exit code %s"% \`
	`41`	`+ (u' '.join(safe_decode(i)foriinself.command),self.status)`
`43`	`42`	`ifself.stderr:`
`44`		`-ret+="\nstderr: '%s'"%self.stderr.decode(defenc)`
	`43`	`+ret+=u"\nstderr: '%s'"%safe_decode(self.stderr)`
`45`	`44`	`ifself.stdout:`
`46`		`-ret+="\nstdout: '%s'"%self.stdout.decode(defenc)`
	`45`	`+ret+=u"\nstdout: '%s'"%safe_decode(self.stdout)`
`47`	`46`	`returnret`
`48`	`47`
`49`	`48`

Comments

(0)