diff options
Diffstat (limited to 'xlators/experimental')
-rwxr-xr-x | xlators/experimental/fdl/src/gen_dumper.py | 4 | ||||
-rwxr-xr-x | xlators/experimental/fdl/src/gen_fdl.py | 2 | ||||
-rwxr-xr-x | xlators/experimental/fdl/src/gen_recon.py | 14 | ||||
-rwxr-xr-x | xlators/experimental/jbr-client/src/gen-fops.py | 8 | ||||
-rwxr-xr-x | xlators/experimental/jbr-server/src/gen-fops.py | 6 |
5 files changed, 17 insertions, 17 deletions
diff --git a/xlators/experimental/fdl/src/gen_dumper.py b/xlators/experimental/fdl/src/gen_dumper.py index 95313adefcc..c15f7c8870d 100755 --- a/xlators/experimental/fdl/src/gen_dumper.py +++ b/xlators/experimental/fdl/src/gen_dumper.py @@ -73,7 +73,7 @@ def get_special_subs (args): def gen_functions (): code = "" - for name, value in ops.iteritems(): + for name, value in ops.items(): if "journal" not in [ x[0] for x in value ]: continue fop_subs[name]["@FUNCTION_BODY@"] = get_special_subs(value) @@ -83,7 +83,7 @@ def gen_functions (): def gen_cases (): code = "" - for name, value in ops.iteritems(): + for name, value in ops.items(): if "journal" not in [ x[0] for x in value ]: continue # Add the CASE fragment for this fop. diff --git a/xlators/experimental/fdl/src/gen_fdl.py b/xlators/experimental/fdl/src/gen_fdl.py index e8f97dc9957..8647ba7b6f1 100755 --- a/xlators/experimental/fdl/src/gen_fdl.py +++ b/xlators/experimental/fdl/src/gen_fdl.py @@ -310,7 +310,7 @@ selective_generate = { def gen_fdl (): entrypoints = [] - for name, value in ops.iteritems(): + for name, value in ops.items(): if "journal" not in [ x[0] for x in value ]: continue diff --git a/xlators/experimental/fdl/src/gen_recon.py b/xlators/experimental/fdl/src/gen_recon.py index ff5b5e16066..c6b3b02a2fe 100755 --- a/xlators/experimental/fdl/src/gen_recon.py +++ b/xlators/experimental/fdl/src/gen_recon.py @@ -142,14 +142,14 @@ def get_special_subs (name, args, fop_type): # is not stored in or read from the journal. There are other ways to # do that, but this is the only place we need anything similar and we # already have to treat it as a special case so this is simplest. - s_args_str = 'fd, &vector, 1, off, iobref, flags, &preop, &postop, xdata' + s_args_str = 'fd, &vector, 1, off, iobref, flags, &preop, &postop, xdata' elif name == 'symlink': # Swap 'linkpath' and 'loc'. s_args_str = '&loc, linkpath, &iatt, xdata' - elif name == 'xattrop': - s_args_str = '&loc, flags, dict, xdata, NULL' - elif name == 'fxattrop': - s_args_str = 'fd, flags, dict, xdata, NULL' + elif name == 'xattrop': + s_args_str = '&loc, flags, dict, xdata, NULL' + elif name == 'fxattrop': + s_args_str = 'fd, flags, dict, xdata, NULL' else: s_args_str = string.join (s_args, ", ") return code, links, s_args_str, cleanups @@ -162,7 +162,7 @@ def get_special_subs (name, args, fop_type): # an error is detected. This will probably get messy. def gen_functions (): code = "" - for name, value in ops.iteritems(): + for name, value in ops.items(): fop_type = [ x[1] for x in value if x[0] == "journal" ] if not fop_type: continue @@ -184,7 +184,7 @@ def gen_functions (): def gen_cases (): code = "" - for name, value in ops.iteritems(): + for name, value in ops.items(): if "journal" not in [ x[0] for x in value ]: continue # Add the CASE fragment for this fop. diff --git a/xlators/experimental/jbr-client/src/gen-fops.py b/xlators/experimental/jbr-client/src/gen-fops.py index 1962d2f8067..47b339910d4 100755 --- a/xlators/experimental/jbr-client/src/gen-fops.py +++ b/xlators/experimental/jbr-client/src/gen-fops.py @@ -14,7 +14,7 @@ from generator import ops, fop_subs, cbk_subs, generate # We really want the callback argument list, even when we're generating fop # code, so we propagate here. # TBD: this should probably be right in generate.py -for k, v in cbk_subs.iteritems(): +for k, v in cbk_subs.items(): fop_subs[k]['@ERROR_ARGS@'] = v['@ERROR_ARGS@'] # Stolen from old codegen.py @@ -29,18 +29,18 @@ def load_templates (path): m = tmpl_re.match(line) if m: if t_name: - templates[t_name] = string.join(t_contents, '') + templates[t_name] = ''.join(t_contents) t_name = m.group(1).strip() t_contents = [] elif t_name: t_contents.append(line) if t_name: - templates[t_name] = string.join(t_contents, '') + templates[t_name] = ''.join(t_contents) return templates # Stolen from gen_fdl.py def gen_client (templates): - for name, value in ops.iteritems(): + for name, value in ops.items(): if name == 'getspec': # It's not real if it doesn't have a stub function. continue diff --git a/xlators/experimental/jbr-server/src/gen-fops.py b/xlators/experimental/jbr-server/src/gen-fops.py index c4c87556cb3..bf6ff912d0c 100755 --- a/xlators/experimental/jbr-server/src/gen-fops.py +++ b/xlators/experimental/jbr-server/src/gen-fops.py @@ -19,7 +19,7 @@ from generator import ops, fop_subs, cbk_subs, generate # We really want the callback argument list, even when we're generating fop # code, so we propagate here. # TBD: this should probably be right in generate.py -for k, v in cbk_subs.iteritems(): +for k, v in cbk_subs.items(): fop_subs[k]['@ERROR_ARGS@'] = v['@ERROR_ARGS@'] # Stolen from old codegen.py @@ -34,13 +34,13 @@ def load_templates (path): m = tmpl_re.match(line) if m: if t_name: - templates[t_name] = string.join(t_contents, '') + templates[t_name] = ''.join(t_contents) t_name = m.group(1).strip() t_contents = [] elif t_name: t_contents.append(line) if t_name: - templates[t_name] = string.join(t_contents, '') + templates[t_name] = ''.join(t_contents) return templates # We need two types of templates. The first, for pure read operations, just |