dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Python 3 fixes (patch #296)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7161 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2020-03-24 02:35:17 +00:00
parent 06f7335cc8
commit bdbfff3cf2
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Contrib/Graphics/SConscript
View file

@ -90,8 +90,8 @@ wizards = Split("""
Import('defenv')
def join(prefix, list):
return map(lambda x: '%s/%s' % (prefix, x), list)
def join(prefix, list_):
return list(map(lambda x: '%s/%s' % (prefix, x), list_))
def dist(dir, files):
defenv.DistributeContrib(join(dir, files), path='Graphics/%s' % dir)

4
Contrib/Modern UI 2/SConscript
View file

@ -34,8 +34,8 @@ pages = Split("""
Import('defenv')
def join(prefix, list):
return map(lambda x: '%s/%s' % (prefix, x), list)
def join(prefix, list_):
return list(map(lambda x: '%s/%s' % (prefix, x), list_))
defenv.DistributeDocs(docs, path=target)
defenv.DistributeDocs(join('../Modern UI/images',doc_images), path='%s/%s'%(target,'images'))

4
Contrib/Modern UI/SConscript
View file

@ -22,8 +22,8 @@ contribs = Split("""
Import('defenv')
def join(prefix, list):
return map(lambda x: '%s/%s' % (prefix, x), list)
def join(prefix, list_):
return list(map(lambda x: '%s/%s' % (prefix, x), list_))
defenv.DistributeDocs(docs, path=target)
path = 'images'

2
Docs/src/history.but
View file

@ -22,6 +22,8 @@ Released on ? ?th, 2020
\b MultiUser: Fixed INSTALLMODE_FUNCTION and added INSTALLMODEPAGE_SHOWUSERNAME
\b Python 3 fixes (\W{http://sf.net/p/nsis/patches/296}{patch #296})
\H{v3.05} 3.05
Released on December 15th, 2019

2
SConstruct
View file

@ -366,7 +366,7 @@ defenv.Execute(Delete('$TESTDISTDIR'))
def Distribute(files, names, component, path, subpath, alias, install_alias=None):
files = MakeFileList(files)
names = names or map(lambda x: x.name, files)
names = names or list(map(lambda x: x.name, files))
if isinstance(names, str):
names = [names]