diff options
author | Lumir Balhar <lbalhar@redhat.com> | 2017-11-06 10:33:38 +0100 |
---|---|---|
committer | Jiri Kastner <jkastner@redhat.com> | 2017-11-20 13:59:01 +0100 |
commit | 08fbd6dd49029e465116d3a6d7ecdf3b885c7fe2 (patch) | |
tree | bb6714a9fdd7e586cffd003044b502f05c41d973 | |
parent | 6b5d3b7df33ce547bbcc93b2d89843d086490acd (diff) | |
download | python-linux-procfs-08fbd6dd49029e465116d3a6d7ecdf3b885c7fe2.tar.gz |
python3: Fixes related to new Python 3 dict views.
Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Signed-off-by: Jiri Kastner <jkastner@redhat.com>
-rwxr-xr-x | pflags-cmd.py | 2 | ||||
-rwxr-xr-x | procfs/procfs.py | 34 | ||||
-rwxr-xr-x | procfs/sysctl.py | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/pflags-cmd.py b/pflags-cmd.py index 85b66ad..6dfa184 100755 --- a/pflags-cmd.py +++ b/pflags-cmd.py @@ -39,7 +39,7 @@ def main(argv): if (len(argv) > 1): pids = reduce(lambda i, j: i + j, map(thread_mapper, argv[1].split(","))) else: - pids = ps.processes.keys() + pids = list(ps.processes.keys()) pids.sort() len_comms = map(lambda pid: len(ps[pid]["stat"]["comm"]), pids) diff --git a/procfs/procfs.py b/procfs/procfs.py index ba477eb..9627ac5 100755 --- a/procfs/procfs.py +++ b/procfs/procfs.py @@ -119,10 +119,10 @@ class pidstat: return self.fields[fieldname] def keys(self): - return self.fields.keys() + return list(self.fields.keys()) def values(self): - return self.fields.values() + return list(self.fields.values()) def has_key(self, fieldname): return fieldname in self.fields @@ -252,10 +252,10 @@ class pidstatus: return self.fields[fieldname] def keys(self): - return self.fields.keys() + return list(self.fields.keys()) def values(self): - return self.fields.values() + return list(self.fields.values()) def has_key(self, fieldname): return fieldname in self.fields @@ -397,10 +397,10 @@ class pidstats: pass def keys(self): - return self.processes.keys() + return list(self.processes.keys()) def values(self): - return self.processes.values() + return list(self.processes.values()) def has_key(self, key): return key in self.processes @@ -569,10 +569,10 @@ class interrupts: return self.interrupts[str(key)] def keys(self): - return self.interrupts.keys() + return list(self.interrupts.keys()) def values(self): - return self.interrupts.values() + return list(self.interrupts.values()) def has_key(self, key): return str(key) in self.interrupts @@ -717,10 +717,10 @@ class cmdline: return self.options[key] def keys(self): - return self.options.keys() + return list(self.options.keys()) def values(self): - return self.options.values() + return list(self.options.values()) def items(self): return self.options @@ -766,10 +766,10 @@ class cpuinfo: return self.tags[key.lower()] def keys(self): - return self.tags.keys() + return list(self.tags.keys()) def values(self): - return self.tags.values() + return list(self.tags.values()) def items(self): return self.tags @@ -833,10 +833,10 @@ class smaps_lib: return self.tags[key.lower()] def keys(self): - return self.tags.keys() + return list(self.tags.keys()) def values(self): - return self.tags.values() + return list(self.tags.values()) def items(self): return self.tags @@ -968,13 +968,13 @@ class cpusstats: return self.entries[key] def __len__(self): - return len(self.entries.keys()) + return len(list(self.entries.keys())) def keys(self): - return self.entries.keys() + return list(self.entries.keys()) def values(self): - return self.entries.values() + return list(self.entries.values()) def items(self): return self.entries diff --git a/procfs/sysctl.py b/procfs/sysctl.py index 4e4b5d5..596fb19 100755 --- a/procfs/sysctl.py +++ b/procfs/sysctl.py @@ -41,7 +41,7 @@ class sysctl: self.cache[key] = value def keys(self): - return self.cache.keys() + return list(self.cache.keys()) def read(self, key): try: |