mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 04:03:39 +00:00
Code Activity

Use sys.getdefaultencoding() instead of sys.stdout.encoding (#6612)

Browse source
This commit is contained in:
Kevin Phoenix 2023-02-28 12:46:10 -07:00 committed by GitHub
parent 6e7d80633d
commit 1a9990a92f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/mk_params_doc.py
View file

@ -37,7 +37,7 @@ def help(ous):
out = subprocess.Popen([z3_exe, "-pm"],stdout=subprocess.PIPE).communicate()[0] out = subprocess.Popen([z3_exe, "-pm"],stdout=subprocess.PIPE).communicate()[0]
modules = ["global"] modules = ["global"]
if out != None: if out != None:
out = out.decode(sys.stdout.encoding) out = out.decode(sys.getdefaultencoding())
module_re = re.compile(r"\[module\] (.*)\,") module_re = re.compile(r"\[module\] (.*)\,")
lines = out.split("\n") lines = out.split("\n")
for line in lines: for line in lines:
@ -48,7 +48,7 @@ def help(ous):
out = subprocess.Popen([z3_exe, "-pmmd:%s" % module],stdout=subprocess.PIPE).communicate()[0] out = subprocess.Popen([z3_exe, "-pmmd:%s" % module],stdout=subprocess.PIPE).communicate()[0]
if out == None: if out == None:
continue continue
out = out.decode(sys.stdout.encoding) out = out.decode(sys.getdefaultencoding())
out = out.replace("\r","") out = out.replace("\r","")
ous.write(out) ous.write(out)

2
doc/mk_tactic_doc.py
View file

@ -28,7 +28,7 @@ def extract_params(ous, tac):
out = subprocess.Popen([z3_exe, f"-tacticsmd:{tac}"], stdout=subprocess.PIPE).communicate()[0] out = subprocess.Popen([z3_exe, f"-tacticsmd:{tac}"], stdout=subprocess.PIPE).communicate()[0]
if not out: if not out:
return return
out = out.decode(sys.stdout.encoding) out = out.decode(sys.getdefaultencoding())
if is_ws(out): if is_ws(out):
return return
ous.write("### Parameters\n\n") ous.write("### Parameters\n\n")

2
scripts/mk_util.py
View file

@ -122,7 +122,7 @@ FPMATH_ENABLED=getenv("FPMATH_ENABLED", "True")
def check_output(cmd): def check_output(cmd):
out = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0] out = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
if out != None: if out != None:
enc = sys.stdout.encoding enc = sys.getdefaultencoding()
if enc != None: return out.decode(enc).rstrip('\r\n') if enc != None: return out.decode(enc).rstrip('\r\n')
else: return out.rstrip('\r\n') else: return out.rstrip('\r\n')
else: else:

4
scripts/update_api.py
View file

@ -1836,14 +1836,14 @@ if sys.version < '3':
else: else:
def _str_to_bytes(s): def _str_to_bytes(s):
if isinstance(s, str): if isinstance(s, str):
enc = sys.stdout.encoding enc = sys.getdefaultencoding()
return s.encode(enc if enc != None else 'latin-1') return s.encode(enc if enc != None else 'latin-1')
else: else:
return s return s
def _to_pystr(s): def _to_pystr(s):
if s != None: if s != None:
enc = sys.stdout.encoding enc = sys.getdefaultencoding()
return s.decode(enc if enc != None else 'latin-1') return s.decode(enc if enc != None else 'latin-1')
else: else:
return "" return ""