X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfaadmin.py;h=4cf77224dffadff832257ae6f41ea699d139e5ef;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=95e139f7966df29ceb8e6d7d85a05ae25400559a;hpb=0ce89bde3d8e9b22f8949c90b6ca37a81acf4b06;p=sfa.git diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py index 95e139f7..4cf77224 100755 --- a/sfa/client/sfaadmin.py +++ b/sfa/client/sfaadmin.py @@ -1,8 +1,8 @@ -#!/usr/bin/python +#!/usr/bin/env python3 # pylint: disable=c0111, c0103, w0402, w0622 -from __future__ import print_function + import os import sys @@ -514,7 +514,7 @@ class SfaAdmin: # returns (name,class) or (None,None) def find_category(self, input): - full_name = Candidates(SfaAdmin.CATEGORIES.keys()).only_match(input) + full_name = Candidates(list(SfaAdmin.CATEGORIES.keys())).only_match(input) if not full_name: return (None, None) return (full_name, SfaAdmin.CATEGORIES[full_name]) @@ -528,7 +528,7 @@ class SfaAdmin: for c in categories: cls = SfaAdmin.CATEGORIES[c] print("==================== category=%s" % c) - names = cls.__dict__.keys() + names = list(cls.__dict__.keys()) names.sort() for name in names: method = cls.__dict__[name] @@ -587,7 +587,7 @@ class SfaAdmin: cmd_kwds = vars(opts) # dont overrride meth - for k, v in cmd_kwds.items(): + for k, v in list(cmd_kwds.items()): if v is None: del cmd_kwds[k]