Commite633cc0

authored and

committed

Remove and replace compat.UnicodeMixin

1 parent05cf33a commite633cc0Copy full SHA for e633cc0

File tree

-17

lines changed

-17

lines changed

Lines changed: 0 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,17 +76,3 @@ def __new__(cls, name, nbases, d):`
`76`	`76`	`d['__metaclass__']=meta`
`77`	`77`	`returnmeta(name,bases,d)`
`78`	`78`	`returnmetaclass(meta.__name__+'Helper',None, {})`
`79`		`-`
`80`		`-`
`81`		`-## From https://docs.python.org/3.3/howto/pyporting.html`
`82`		`-classUnicodeMixin(object):`
`83`		`-`
`84`		`-"""Mixin class to handle defining the proper __str__/__unicode__`
`85`		`- methods in Python 2 or 3."""`
`86`		`-`
`87`		`-ifPY3:`
`88`		`-def__str__(self):`
`89`		`-returnself.__unicode__()`
`90`		`-else:# Python 2`
`91`		`-def__str__(self):`
`92`		`-returnself.__unicode__().encode(defenc)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`""" Module containing all exceptions thrown throughout the git package, """`
`7`	`7`
`8`	`8`	`fromgitdb.excimport*# NOQA @UnusedWildImport skipcq: PYL-W0401, PYL-W0614`
`9`		`-fromgit.compatimportUnicodeMixin,safe_decode,string_types`
	`9`	`+fromgit.compatimportsafe_decode,string_types`
`10`	`10`
`11`	`11`
`12`	`12`	`classGitError(Exception):`
`@@ -25,7 +25,7 @@ class NoSuchPathError(GitError, OSError):`
`25`	`25`	`""" Thrown if a path could not be access by the system. """`
`26`	`26`
`27`	`27`
`28`		`-classCommandError(UnicodeMixin,GitError):`
	`28`	`+classCommandError(GitError):`
`29`	`29`	"""Base class for exceptions thrown at every stage of `Popen()` execution.
`30`	`30`
`31`	`31`	`:param command:`
`@@ -58,7 +58,7 @@ def __init__(self, command, status=None, stderr=None, stdout=None):`
`58`	`58`	`self.stdout=stdoutandu"\n stdout: '%s'"%safe_decode(stdout)or''`
`59`	`59`	`self.stderr=stderrandu"\n stderr: '%s'"%safe_decode(stderr)or''`
`60`	`60`
`61`		`-def__unicode__(self):`
	`61`	`+def__str__(self):`
`62`	`62`	`return (self._msg+"\n cmdline: %s%s%s")% (`
`63`	`63`	`self._cmd,self._cause,self._cmdline,self.stdout,self.stderr)`
`64`	`64`

Comments

(0)