sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

PY3: fix iteritems usage, not supported in python3

Browse Source 
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power 2018-07-31 18:04:30 +01:00 committed by Andrew Bartlett
parent 3cc284b2af
commit 693834f731
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/replace/wscript
View File

@ -787,8 +787,8 @@ def build(bld):
REPLACE_HOSTCC_SOURCE = ''
for filename, functions in REPLACEMENT_FUNCTIONS.iteritems():
for function in functions:
for filename in REPLACEMENT_FUNCTIONS.keys():
for function in REPLACEMENT_FUNCTIONS[filename]:
if not bld.CONFIG_SET('HAVE_%s' % function.upper()):
REPLACE_HOSTCC_SOURCE += ' %s' % filename
break

7
pidl/wscript
View File

@ -59,15 +59,16 @@ def build(bld):
'lib/Parse/Pidl/Wireshark/NDR.pm': 'man3/Parse::Pidl::Wireshark::NDR.${PERLMAN3EXT}'
}
for k, v in pidl_manpages.iteritems():
pidl_manpages[k] = bld.EXPAND_VARIABLES(v)
for k in pidl_manpages.keys():
pidl_manpages[k] = bld.EXPAND_VARIABLES(pidl_manpages[k])
# use perl to build the manpages
bld.env.pidl_srcdir = os.path.join(bld.srcnode.abspath(), 'pidl')
bld.SET_BUILD_GROUP('final')
if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
for src, manpage in pidl_manpages.iteritems():
for src in pidl_manpages.keys():
manpage = pidl_manpages[src]
section = string.rsplit(manpage, ".", 1)[1]
bld(rule='${POD2MAN} -c "Samba Documentation" -s %s ${SRC} ${TGT}' % section,
shell=True,