add new collection row factory, query cleanup

1 files changed, 1 insertions, 16 deletions

diff --git a/patchtracker/SourceArchive.py b/patchtracker/SourceArchive.py
index c15c5f9..b8bc9eb 100755
--- a/patchtracker/SourceArchive.py
+++ b/patchtracker/SourceArchive.py
@@ -119,20 +119,6 @@ class SourcePackage:
   def __str__(self):
     return self.name
 
-class MasterIndex:
-  def __init__(self):
-    self.pkgcounts = {}
-
-  def add(self, name):
-    idx = getidx(name)
-    if not self.pkgcounts.has_key(idx):
-      self.pkgcounts[idx] = 1
-    else:
-      self.pkgcounts[idx] += 1
-
-  def indices(self):
-    return sorted(self.pkgcounts.iterkeys())
- 
 class SourcePackageIndex:
   def __init__(self):
     self.pkgs = {}
@@ -149,8 +135,7 @@ class SourcePackageIndex:
     return self.pkgs[getidx(letter)]
 
   def indices(self):
-    for k,v in sorted(self.pkgs.iteritems()):
-      yield (k,v)
+    return sorted(self.pkgs.iterkeys())
 
 # basic module tests
 if __name__ == "__main__":