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

python 3 fixes

Browse source 
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
This commit is contained in:
Nuno Lopes 2015-05-19 13:47:43 +01:00
parent 7232877d92
commit 8ff7735a20
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/mk_util.py
View file

@ -553,7 +553,7 @@ def display_help(exit_code):
if IS_WINDOWS: if IS_WINDOWS:
print(" -n, --nodotnet do not generate Microsoft.Z3.dll make rules.") print(" -n, --nodotnet do not generate Microsoft.Z3.dll make rules.")
if IS_WINDOWS: if IS_WINDOWS:
print(" --optimize generate optimized code during linking.") print(" --optimize generate optimized code during linking.")
print(" -j, --java generate Java bindings.") print(" -j, --java generate Java bindings.")
print(" --ml generate OCaml bindings.") print(" --ml generate OCaml bindings.")
print(" --staticlib build Z3 static library.") print(" --staticlib build Z3 static library.")
@ -621,8 +621,8 @@ def parse_options():
DOTNET_ENABLED = False DOTNET_ENABLED = False
elif opt in ('--staticlib'): elif opt in ('--staticlib'):
STATIC_LIB = True STATIC_LIB = True
elif opt in ('--optimize'): elif opt in ('--optimize'):
OPTIMIZE = True OPTIMIZE = True
elif not IS_WINDOWS and opt in ('-p', '--prefix'): elif not IS_WINDOWS and opt in ('-p', '--prefix'):
PREFIX = arg PREFIX = arg
PYTHON_PACKAGE_DIR = os.path.join(PREFIX, 'lib', 'python%s' % distutils.sysconfig.get_python_version(), 'dist-packages') PYTHON_PACKAGE_DIR = os.path.join(PREFIX, 'lib', 'python%s' % distutils.sysconfig.get_python_version(), 'dist-packages')
@ -1786,8 +1786,8 @@ def mk_config():
'SLINK_EXTRA_FLAGS=/link /DEBUG /MACHINE:X64 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE:NO\n') 'SLINK_EXTRA_FLAGS=/link /DEBUG /MACHINE:X64 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE:NO\n')
else: else:
# Windows Release mode # Windows Release mode
if OPTIMIZE: if OPTIMIZE:
config.write('AR_FLAGS=/nologo /LTCG\n') config.write('AR_FLAGS=/nologo /LTCG\n')
config.write( config.write(
'LINK_FLAGS=/nologo /MD\n' 'LINK_FLAGS=/nologo /MD\n'
'SLINK_FLAGS=/nologo /LD\n') 'SLINK_FLAGS=/nologo /LD\n')

16
src/api/python/z3util.py
View file

@ -210,18 +210,18 @@ def prove(claim,assume=None,verbose=0):
if verbose >= 2: if verbose >= 2:
print 'assume: ' print('assume: ')
print assume print(assume)
print 'claim: ' print('claim: ')
print claim print(claim)
print 'to_prove: ' print('to_prove: ')
print to_prove print(to_prove)
f = Not(to_prove) f = Not(to_prove)
models = get_models(f,k=1) models = get_models(f,k=1)
if models is None: #unknown if models is None: #unknown
print 'E: cannot solve !' print('E: cannot solve !')
return None, None return None, None
elif models == False: #unsat elif models == False: #unsat
return True,None return True,None
@ -458,7 +458,7 @@ def model_str(m,as_str=True):
if m : if m :
vs = [(v,m[v]) for v in m] vs = [(v,m[v]) for v in m]
vs = sorted(vs,key=lambda (a,_): str(a)) vs = sorted(vs,key=lambda a,_: str(a))
if as_str: if as_str:
return '\n'.join(['{} = {}'.format(k,v) for (k,v) in vs]) return '\n'.join(['{} = {}'.format(k,v) for (k,v) in vs])
else: else: