X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgraph.py;h=0566130bb29168e4846ca4ed3bf8c89cedcb66c6;hb=519c1dbf89c13557afc15a429164616ac563d379;hp=022e98c94c83d6ab61bb9dfede316cab38798b3c;hpb=c6af7014864c9a2e5d13fc44d0a63f445e8ccce6;p=dak.git

diff --git a/dak/graph.py b/dak/graph.py
index 022e98c9..0566130b 100755
--- a/dak/graph.py
+++ b/dak/graph.py
@@ -22,7 +22,7 @@
 
 import os
 import sys
-import coloursys
+import colorsys
 
 import rrdtool
 import apt_pkg
@@ -105,7 +105,7 @@ GPRINT:avgd%i:avg\\: %%.0lf\\j
     rrd_args += extra_args
     try:
         ret = rrdtool.graph(*rrd_args)
-    except rrdtool.error, e:
+    except rrdtool.error as e:
         print('warning: graph: rrdtool error, skipping %s-%s.png: %s' % (name, graph, e))
 
 def graph_normal(rrd_dir, image_dir, name, extra_args, graph, title, start, year_lines=False):
@@ -157,7 +157,7 @@ GPRINT:avgds0:avg\\: %%.0lf\\j
     rrd_args += extra_args
     try:
         ret = rrdtool.graph(*rrd_args)
-    except rrdtool.error, e:
+    except rrdtool.error as e:
         print('warning: graph: rrdtool error, skipping %s-%s.png: %s' % (name, graph, e))
 
 ################################################################################
@@ -175,9 +175,9 @@ def main():
         if not Cnf.has_key("Graph::Options::%s" % (i)):
             Cnf["Graph::Options::%s" % (i)] = ""
 
-    apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
+    apt_pkg.parse_commandline(Cnf, Arguments, sys.argv)
 
-    Options = Cnf.SubTree("Graph::Options")
+    Options = Cnf.subtree("Graph::Options")
     if Options["Help"]:
         usage()
 
@@ -187,7 +187,7 @@ def main():
         for i in Cnf["Graph::Options::Names"].split(","):
             names.append(i)
     elif Cnf.has_key("Graph::Names"):
-        names = Cnf.ValueList("Graph::Names")
+        names = Cnf.value_list("Graph::Names")
     else:
         names = default_names
 
@@ -199,7 +199,7 @@ def main():
             extra_rrdtool_args.extend(f.read().strip().split("\n"))
             f.close()
     elif Cnf.has_key("Graph::Extra-Rrd"):
-        for i in Cnf.ValueList("Graph::Extra-Rrd"):
+        for i in Cnf.value_list("Graph::Extra-Rrd"):
             f = open(i)
             extra_rrdtool_args.extend(f.read().strip().split("\n"))
             f.close()