diff --git a/observium/scripts/logparser b/observium/scripts/logparser index 481f16d..81daa64 100755 --- a/observium/scripts/logparser +++ b/observium/scripts/logparser @@ -35,7 +35,7 @@ with open(logfile) as log: sortedlist = list(reversed(sorted(commandlist))) toplist = sortedlist[:topnumber] -print "Time - SNMP Command" -print "-------------------" +print("Time - SNMP Command") +print("-------------------") for row in toplist: - print "%s - %s" % (row[0],row[1]) + print("%s - %s" % (row[0],row[1])) diff --git a/observium/scripts/rrdtoolx.py b/observium/scripts/rrdtoolx.py index 514028b..cd6db2e 100755 --- a/observium/scripts/rrdtoolx.py +++ b/observium/scripts/rrdtoolx.py @@ -93,9 +93,9 @@ class RRD(object): except AttributeError: setattr(self, k, v) # Set ds.name attribute from dict keys. - for k,v in ds.items(): v.name = k + for k,v in list(ds.items()): v.name = k # Turn ds into a dict keyed by index. - ds = dict((d.index,d) for d in ds.values()) + ds = dict((d.index,d) for d in list(ds.values())) # Set self.ds and self.rra as lists in index order. self.ds = [ds[i] for i in sorted(ds)] self.rra = [rra[i] for i in sorted(rra)] @@ -161,7 +161,7 @@ class RRD(object): if __name__ == "__main__": if len(sys.argv)<3 or sys.argv[1] in ("-?", "-h", "help"): - print __doc__ % dict(cmd=os.path.basename(sys.argv[0])) + print(__doc__ % dict(cmd=os.path.basename(sys.argv[0]))) sys.exit(1) cmd = sys.argv[1] rrd=RRD(sys.argv[2]) @@ -170,7 +170,7 @@ if __name__ == "__main__": rras = [RRA(r) for r in sys.argv[4:]] rrd.addRRA(filename, rras) elif cmd == "summary": - print rrd.getSummary() + print(rrd.getSummary()) else: sys.stderr.write('Error: Unknown command %r.\n' % cmd) sys.exit(1) diff --git a/observium/scripts/split-mib-definitions b/observium/scripts/split-mib-definitions index b1b2e78..187ed10 100755 --- a/observium/scripts/split-mib-definitions +++ b/observium/scripts/split-mib-definitions @@ -20,30 +20,30 @@ try: import sys except: - print("ERROR: missing required python module: %s" % ('sys')) + print(("ERROR: missing required python module: %s" % ('sys'))) try: import os except: - print("ERROR: missing required python module: %s" % ('os')) + print(("ERROR: missing required python module: %s" % ('os'))) sys.exit(1) try: import glob except: - print("ERROR: missing required python module: %s" % ('glob')) + print(("ERROR: missing required python module: %s" % ('glob'))) sys.exit(1) try: import argparse except: - print("ERROR: missing required python module: %s" % ('argparse')) + print(("ERROR: missing required python module: %s" % ('argparse'))) sys.exit(1) try: import re except: - print("ERROR: missing required python module: %s" % ('re')) + print(("ERROR: missing required python module: %s" % ('re'))) sys.exit(1) """ @@ -99,9 +99,9 @@ for mibs in args.MIB: f = open(file, 'r') except: if os.path.isdir(file): - print('skipping \'%s\' -- dir' % file) + print(('skipping \'%s\' -- dir' % file)) else: - print('skipping \'%s\' -- unable to open' % file) + print(('skipping \'%s\' -- unable to open' % file)) continue mibs = 0 @@ -176,7 +176,7 @@ for mib_dir in definitions: try: n = open(file_name, 'w') except: - print('WARNING: file \'%s\' not have write permissions.' % file_name) + print(('WARNING: file \'%s\' not have write permissions.' % file_name)) break n.write(head + definitions[mib_dir] + "\n\n// EOF\n")