X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fstats.py;h=105bf6c9f64aec6347a728f8acb5bf8c9ecf49b0;hb=74c5a1256401a709d74c496b972cc0bd38decaa8;hp=3ff2caef929d8c1baf74612045f17e13a42c1092;hpb=7aaaad3135c9164390af5897925660842368660b;p=dak.git

diff --git a/dak/stats.py b/dak/stats.py
index 3ff2caef..105bf6c9 100755
--- a/dak/stats.py
+++ b/dak/stats.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Various statistical pr0nography fun and games
+""" Various statistical pr0nography fun and games """
 # Copyright (C) 2000, 2001, 2002, 2003, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 
 import pg, sys
 import apt_pkg
-import dak.lib.utils as utils
+from daklib import utils
 
 ################################################################################
 
@@ -71,9 +71,9 @@ SELECT a.arch_string as Architecture, sum(f.size)
 
 def daily_install_stats():
     stats = {}
-    file = utils.open_file("2001-11")
-    for line in file.readlines():
-        split = line.strip().split('~')
+    f = utils.open_file("2001-11")
+    for line in f.readlines():
+        split = line.strip().split('|')
         program = split[1]
         if program != "katie" and program != "process-accepted":
             continue
@@ -140,15 +140,15 @@ def number_of_packages():
     q = projectB.query("SELECT id, suite_name FROM suite")
     suite_ql = q.getresult()
     for i in suite_ql:
-        (id, name) = i
-        suites[id] = name
-        suite_ids[name] = id
+        (sid, name) = i
+        suites[sid] = name
+        suite_ids[name] = sid
     # Build up architecture mapping
     q = projectB.query("SELECT id, arch_string FROM architecture")
     for i in q.getresult():
-        (id, name) = i
-        arches[id] = name
-        arch_ids[name] = id
+        (aid, name) = i
+        arches[aid] = name
+        arch_ids[name] = aid
     # Pre-create the dictionary
     for suite_id in suites.keys():
         d[suite_id] = {}
@@ -182,7 +182,7 @@ SELECT suite, count(suite) FROM src_associations GROUP BY suite;""")
         for arch in Cnf.ValueList("Suite::%s::Architectures" % (suite)):
             suite_arches[suite_id][arch] = ""
         suite_id_list.append(suite_id)
-    output_list = map(lambda x: output_format(x), suite_list)
+    output_list = [ output_format(i) for i in suite_list ]
     longest_suite = longest(output_list)
     arch_list = arches.values()
     arch_list.sort()
@@ -216,14 +216,14 @@ def main ():
     Cnf = utils.get_conf()
     Arguments = [('h',"help","Stats::Options::Help")]
     for i in [ "help" ]:
-	if not Cnf.has_key("Stats::Options::%s" % (i)):
-	    Cnf["Stats::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Stats::Options::%s" % (i)):
+            Cnf["Stats::Options::%s" % (i)] = ""
 
     args = apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
 
     Options = Cnf.SubTree("Stats::Options")
     if Options["Help"]:
-	usage()
+        usage()
 
     if len(args) < 1:
         utils.warn("dak stats requires a MODE argument")
@@ -249,4 +249,3 @@ def main ():
 
 if __name__ == '__main__':
     main()
-