Commitcbd9ca4

authored and

committed

Remove and replace compat.unicode

1 parentb5dd2f0 commitcbd9ca4Copy full SHA for cbd9ca4

File tree

-9

lines changed

-9

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@`
`25`	`25`	`defenc,`
`26`	`26`	`force_bytes,`
`27`	`27`	`PY3,`
`28`		`-# just to satisfy flake8 on py3`
`29`		`-unicode,`
`30`	`28`	`safe_decode,`
`31`	`29`	`is_posix,`
`32`	`30`	`is_win,`
`@@ -920,15 +918,15 @@ def __unpack_args(cls, arg_list):`
`920`	`918`	`ifnotisinstance(arg_list, (list,tuple)):`
`921`	`919`	`# This is just required for unicode conversion, as subprocess can't handle it`
`922`	`920`	`# However, in any other case, passing strings (usually utf-8 encoded) is totally fine`
`923`		`-ifnotPY3andisinstance(arg_list,unicode):`
	`921`	`+ifnotPY3andisinstance(arg_list,str):`
`924`	`922`	`return [arg_list.encode(defenc)]`
`925`	`923`	`return [str(arg_list)]`
`926`	`924`
`927`	`925`	`outlist= []`
`928`	`926`	`forarginarg_list:`
`929`	`927`	`ifisinstance(arg_list, (list,tuple)):`
`930`	`928`	`outlist.extend(cls.__unpack_args(arg))`
`931`		`-elifnotPY3andisinstance(arg_list,unicode):`
	`929`	`+elifnotPY3andisinstance(arg_list,str):`
`932`	`930`	`outlist.append(arg_list.encode(defenc))`
`933`	`931`	`# END recursion`
`934`	`932`	`else:`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,18 +32,16 @@`
`32`	`32`	`defenc=sys.getfilesystemencoding()`
`33`	`33`
`34`	`34`	`ifPY3:`
`35`		`-unicode=str`
`36`	`35`	`binary_type=bytes`
`37`	`36`	`else:`
`38`	`37`	`ifdefenc=='ascii':`
`39`	`38`	`defenc='utf-8'`
`40`		`-unicode=unicode`
`41`	`39`	`binary_type=str`
`42`	`40`
`43`	`41`
`44`	`42`	`defsafe_decode(s):`
`45`	`43`	`"""Safely decodes a binary string to unicode"""`
`46`		`-ifisinstance(s,unicode):`
	`44`	`+ifisinstance(s,str):`
`47`	`45`	`returns`
`48`	`46`	`elifisinstance(s,bytes):`
`49`	`47`	`returns.decode(defenc,'surrogateescape')`
`@@ -53,7 +51,7 @@ def safe_decode(s):`
`53`	`51`
`54`	`52`	`defsafe_encode(s):`
`55`	`53`	`"""Safely decodes a binary string to unicode"""`
`56`		`-ifisinstance(s,unicode):`
	`54`	`+ifisinstance(s,str):`
`57`	`55`	`returns.encode(defenc)`
`58`	`56`	`elifisinstance(s,bytes):`
`59`	`57`	`returns`
`@@ -63,7 +61,7 @@ def safe_encode(s):`
`63`	`61`
`64`	`62`	`defwin_encode(s):`
`65`	`63`	`"""Encode unicodes for process arguments on Windows."""`
`66`		`-ifisinstance(s,unicode):`
	`64`	`+ifisinstance(s,str):`
`67`	`65`	`returns.encode(locale.getpreferredencoding(False))`
`68`	`66`	`elifisinstance(s,bytes):`
`69`	`67`	`returns`

Comments

(0)