Merge branch 'maint'

1 files changed, 4 insertions, 4 deletions

diff --git a/host/lib/rfnoc/nocscript/gen_basic_funcs.py b/host/lib/rfnoc/nocscript/gen_basic_funcs.py
index 702b3e884..e4971d2e9 100755
--- a/host/lib/rfnoc/nocscript/gen_basic_funcs.py
+++ b/host/lib/rfnoc/nocscript/gen_basic_funcs.py
@@ -331,9 +331,9 @@ REGISTER_COMMANDS_TEMPLATE = """
     );"""
 
 DOXY_TEMPLATE = """/*! \page page_nocscript_funcs NocScript Function Reference
-% for cat, func_by_name in func_list_tree.iteritems():
+% for cat, func_by_name in func_list_tree.items():
 - ${cat}
-%   for func_name, func_info_list in func_by_name.iteritems():
+%   for func_name, func_info_list in func_by_name.items():
   - ${func_name}: ${func_info_list[0]['docstring']}
 %     for func_info in func_info_list:
     - ${func_info['arglist']} -> ${func_info['retval']}
@@ -452,9 +452,9 @@ def write_manual_file(output_filename):
     func_list = prep_function_list()
     func_list_tree = {}
     for func in func_list:
-        if not func_list_tree.has_key(func['category']):
+        if func['category'] not in func_list_tree:
             func_list_tree[func['category']] = {}
-        if not func_list_tree[func['category']].has_key(func['name']):
+        if func['name'] not in func_list_tree[func['category']]:
             func_list_tree[func['category']][func['name']] = []
         func_list_tree[func['category']][func['name']].append(func)
     open(output_filename, 'w').write(parse_tmpl(DOXY_TEMPLATE, func_list_tree=func_list_tree))