* 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

2 files changed, 4 insertions, 3 deletions

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" % \