Commit7b70e9e

committed

Helpers.GetDefaultEncoding is added

This function is equal to os_ops.get_default_encoding and is used in: - Helpers.PrepareProcessInput - RaiseError._TranslateDataIntoString__FromBinary

1 parent3cc19d2 commit7b70e9eCopy full SHA for 7b70e9e

File tree

+40

-2

lines changed

+40

-2

lines changed

Lines changed: 38 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,48 @@`
	`1`	`+importlocale`
	`2`	`+`
	`3`	`+`
`1`	`4`	`classHelpers:`
	`5`	`+def_make_get_default_encoding_func():`
	`6`	`+# locale.getencoding is added in Python 3.11`
	`7`	`+ifhasattr(locale,'getencoding'):`
	`8`	`+returnlocale.getencoding`
	`9`	`+`
	`10`	`+# It must exist`
	`11`	`+returnlocale.getpreferredencoding`
	`12`	`+`
	`13`	`+# Prepared pointer on function to get a name of system codepage`
	`14`	`+_get_default_encoding_func=_make_get_default_encoding_func()`
	`15`	`+`
	`16`	`+defGetDefaultEncoding():`
	`17`	`+#`
	`18`	`+# Original idea/source was:`
	`19`	`+#`
	`20`	`+# def os_ops.get_default_encoding():`
	`21`	`+# if not hasattr(locale, 'getencoding'):`
	`22`	`+# locale.getencoding = locale.getpreferredencoding`
	`23`	`+# return locale.getencoding() or 'UTF-8'`
	`24`	`+#`
	`25`	`+`
	`26`	`+assert__class__._get_default_encoding_funcisnotNone`
	`27`	`+`
	`28`	`+r=__class__._get_default_encoding_func()`
	`29`	`+`
	`30`	`+ifr:`
	`31`	`+assertrisnotNone`
	`32`	`+asserttype(r)==str# noqa: E721`
	`33`	`+assertr!=""`
	`34`	`+returnr`
	`35`	`+`
	`36`	`+# Is it an unexpected situation?`
	`37`	`+return'UTF-8'`
	`38`	`+`
`2`	`39`	`defPrepareProcessInput(input,encoding):`
`3`	`40`	`ifnotinput:`
`4`	`41`	`returnNone`
`5`	`42`
`6`	`43`	`iftype(input)==str:# noqa: E721`
`7`	`44`	`ifencodingisNone:`
`8`		`-returninput.encode()`
	`45`	`+returninput.encode(__class__.GetDefaultEncoding())`
`9`	`46`
`10`	`47`	`asserttype(encoding)==str# noqa: E721`
`11`	`48`	`returninput.encode(encoding)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from ..exceptionsimportExecUtilException`
	`2`	`+from .helpersimportHelpers`
`2`	`3`
`3`	`4`
`4`	`5`	`classRaiseError:`
`@@ -29,7 +30,7 @@ def _TranslateDataIntoString__FromBinary(data):`
`29`	`30`	`asserttype(data)==bytes# noqa: E721`
`30`	`31`
`31`	`32`	`try:`
`32`		`-returndata.decode('utf-8')`
	`33`	`+returndata.decode(Helpers.GetDefaultEncoding())`
`33`	`34`	`exceptUnicodeDecodeError:`
`34`	`35`	`pass`
`35`	`36`

Comments

(0)