Fix Travis and a few Python 3 fixes

Author: dagwieers

.travis.yml

@@ -5,7 +5,6 @@ python:
 - "2.7"
 - "3.5"
 - "3.6"
-- "3.7"
 #install:
 #  - pip install dbus-python
 #  - pip install python-utmp

Makefile

@@ -33,6 +33,7 @@ clean:
 	$(MAKE) -C docs clean
 
 test:
+	./dstat --version
 	./dstat -taf 1 5
 	./dstat -t --all-plugins 1 5
 

dstat

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 ### This program is free software; you can redistribute it and/or
 ### modify it under the terms of the GNU General Public License
@@ -151,7 +151,7 @@ class Options:
 
             elif opt in ['--all-plugins']:
                 ### Make list unique in a fancy fast way
-                plugins = {}.fromkeys(allplugins).keys()
+                plugins = list({}.fromkeys(allplugins).keys())
                 plugins.sort()
                 self.plugins += plugins
             elif opt in ['--bits']:
@@ -1837,7 +1837,7 @@ def set_theme():
 def ticks():
     "Return the number of 'ticks' since bootup"
     try:
-        for line in open('/proc/uptime', 'r', 0).readlines():
+        for line in open('/proc/uptime', 'r').readlines():
             l = line.split()
             if len(l) < 2: continue
             return float(l[0])
@@ -2555,12 +2555,12 @@ def main():
     ### Prepare CSV output file (unbuffered)
     if op.output:
         if not os.path.exists(op.output):
-            outputfile = open(op.output, 'w', 0)
+            outputfile = open(op.output, 'w')
             outputfile.write('"Dstat %s CSV output"\n' % VERSION)
             header = ('"Author:","Dag Wieers <[email protected]>"','','','','"URL:"','"http://dag.wieers.com/home-made/dstat/"\n')
             outputfile.write(char['sep'].join(header))
         else:
-            outputfile = open(op.output, 'a', 0)
+            outputfile = open(op.output, 'a')
             outputfile.write('\n\n')
 
         header = ('"Host:"','"%s"' % hostname,'','','','"User:"','"%s"\n' % user)
@@ -2571,7 +2571,7 @@ def main():
     ### Create pidfile
     if op.pidfile:
         try:
-            pidfile = open(op.pidfile, 'w', 0)
+            pidfile = open(op.pidfile, 'w')
             pidfile.write(str(os.getpid()))
             pidfile.close()
         except Exception as e: