* rename aptsources to sourceslist (aptsources is already used by the

  package, since the other parts were moved away this file only
  contains sources.list parsing and manipulating only)
* rename get_ubuntu_lp_mirror to get_ubuntu_mirrors_from_lp (should be 
  clearer)
* fix some imports

4 files changed, 16 insertions, 7 deletions

diff --git a/aptsources/distro.py b/aptsources/distro.py
index 18a8ca46..5b4c6522 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -21,6 +21,14 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
+import string
+import gettext
+import re
+import os
+import sys
+from gettext import gettext as _
+
+
 class Distribution:
   def __init__(self, id, codename, description, release):
     """ Container for distribution specific informations """
diff --git a/aptsources/aptsources.py b/aptsources/sourceslist.py
index 0928a0e8..14c2a0ea 100644
--- a/aptsources/aptsources.py
+++ b/aptsources/sourceslist.py
@@ -36,7 +36,7 @@ from gettext import gettext as _
 #import pdb
 
 #from UpdateManager.Common.DistInfo import DistInfo
-from DistInfo import DistInfo
+from distinfo import DistInfo
 
 # some global helpers
 def is_mirror(master_uri, compare_uri):
@@ -385,9 +385,9 @@ class SourceEntryMatcher:
         i = f.find(".info")
         f = f[0:i]
         dist = DistInfo(f,base_dir=matcherPath)
-        for suite in dist.suites:
-            if suite.match_uri != None:
-                self.templates.append(suite)
+        for template in dist.templates:
+            if template.match_uri != None:
+                self.templates.append(template)
     return
 
   def match(self, source):
diff --git a/utils/get_ubuntu_lp_mirrors.py b/utils/get_ubuntu_mirrors_from_lp.py
index fad495b5..fad495b5 100755
--- a/utils/get_ubuntu_lp_mirrors.py
+++ b/utils/get_ubuntu_mirrors_from_lp.py
diff --git a/utils/mirrortest b/utils/mirrortest
index 9748c138..75ef917b 100755
--- a/utils/mirrortest
+++ b/utils/mirrortest
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import threading, Queue, time, re, os, tempfile
-import AptSources.aptsources as aptsources
+import aptsources.sourceslist
+import aptsources.distro
 from timeit import Timer
 import urllib
 import socket
@@ -87,8 +88,8 @@ class MirrorTest:
             print "%s: %s KByte/s" % (f[1].hostname, int(f[0]))
 
 if __name__ == "__main__":
-    distro = aptsources.get_distro()
-    distro.get_sources(aptsources.SourcesList())
+    distro = aptsources.distro.get_distro()
+    distro.get_sources(aptsources.sourceslist.SourcesList())
     pipe = os.popen("dpkg --print-architecture")
     arch = pipe.read().strip()
     test_file = "dists/%s/%s/binary-%s/Packages.gz" % \