10 files changed, 25 insertions, 25 deletions
diff --git a/pym/cache/anydbm.py b/pym/cache/anydbm.py
index e250980b9..87e448f30 100644
--- a/pym/cache/anydbm.py
+++ b/pym/cache/anydbm.py
@@ -9,8 +9,8 @@ try:
 except ImportError:
 	import pickle
 import os
-import fs_template
-import cache_errors
+from cache import fs_template
+from cache import cache_errors
 
 
 class database(fs_template.FsBased):
diff --git a/pym/cache/flat_hash.py b/pym/cache/flat_hash.py
index 59b00e8d4..c46f00593 100644
--- a/pym/cache/flat_hash.py
+++ b/pym/cache/flat_hash.py
@@ -3,11 +3,11 @@
 # License: GPL2
 # $Id$
 
-import fs_template
-import cache_errors
+from cache import fs_template
+from cache import cache_errors
 import errno, os, stat
-from mappings import LazyLoad, ProtectedDict
-from template import reconstruct_eclasses
+from cache.mappings import LazyLoad, ProtectedDict
+from cache.template import reconstruct_eclasses
 # store the current key order *here*.
 class database(fs_template.FsBased):
 
diff --git a/pym/cache/flat_list.py b/pym/cache/flat_list.py
index 135b31e39..0cd3edb0e 100644
--- a/pym/cache/flat_list.py
+++ b/pym/cache/flat_list.py
@@ -1,5 +1,5 @@
-import fs_template
-import cache_errors
+from cache import fs_template
+from cache import cache_errors
 import errno, os, stat
 
 # store the current key order *here*.
diff --git a/pym/cache/fs_template.py b/pym/cache/fs_template.py
index c63856da1..b76e98bd3 100644
--- a/pym/cache/fs_template.py
+++ b/pym/cache/fs_template.py
@@ -4,7 +4,7 @@
 # $Id$
 
 import os
-import template, cache_errors
+from cache import template
 from portage_data import portage_gid
 
 class FsBased(template.database):
diff --git a/pym/cache/metadata.py b/pym/cache/metadata.py
index 329af224c..0d5402342 100644
--- a/pym/cache/metadata.py
+++ b/pym/cache/metadata.py
@@ -4,11 +4,10 @@
 # $Id$
 
 import os, stat, types
-import flat_hash
-import cache_errors
+from cache import flat_hash
 import eclass_cache 
-from template import reconstruct_eclasses, serialize_eclasses
-from mappings import ProtectedDict, LazyLoad
+from cache.template import reconstruct_eclasses
+from cache.mappings import ProtectedDict
 
 # this is the old cache format, flat_list.  count maintained here.
 magic_line_count = 22
diff --git a/pym/cache/metadata_overlay.py b/pym/cache/metadata_overlay.py
index 287e05521..673ba8dff 100644
--- a/pym/cache/metadata_overlay.py
+++ b/pym/cache/metadata_overlay.py
@@ -5,9 +5,9 @@
 import time
 if not hasattr(__builtins__, "set"):
 	from sets import Set as set
-import template
-from flat_hash import database as db_rw
-from metadata import database as db_ro
+from cache import template
+from cache.flat_hash import database as db_rw
+from cache.metadata import database as db_ro
 
 class database(template.database):
 
diff --git a/pym/cache/sql_template.py b/pym/cache/sql_template.py
index 92e9e8713..5c8af08f8 100644
--- a/pym/cache/sql_template.py
+++ b/pym/cache/sql_template.py
@@ -3,8 +3,8 @@
 # License: GPL2
 # $Id$
 
-import template, cache_errors
-from template import reconstruct_eclasses
+from cache import template, cache_errors
+from cache.template import reconstruct_eclasses
 
 class SQLDatabase(template.database):
 	"""template class for RDBM based caches
diff --git a/pym/cache/sqlite.py b/pym/cache/sqlite.py
index 4863b5997..78d4cd649 100644
--- a/pym/cache/sqlite.py
+++ b/pym/cache/sqlite.py
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-import fs_template
-import cache_errors
+from cache import fs_template
+from cache import cache_errors
 import errno, os, stat
-from mappings import LazyLoad, ProtectedDict
-from template import reconstruct_eclasses
+from cache.mappings import LazyLoad, ProtectedDict
+from cache.template import reconstruct_eclasses
 from portage_util import writemsg, apply_secpass_permissions
 from portage_data import portage_gid
 from pysqlite2 import dbapi2 as db_module
diff --git a/pym/cache/template.py b/pym/cache/template.py
index 7389a142e..ff2bbeacf 100644
--- a/pym/cache/template.py
+++ b/pym/cache/template.py
@@ -3,8 +3,9 @@
 # License: GPL2
 # $Id$
 
-import cache_errors
-from mappings import ProtectedDict
+from cache import cache_errors
+from cache.cache_errors import InvalidRestriction
+from cache.mappings import ProtectedDict
 
 class database(object):
 	# this is for metadata/cache transfer.
diff --git a/pym/cache/util.py b/pym/cache/util.py
index 0c8e585fd..f2f62991c 100644
--- a/pym/cache/util.py
+++ b/pym/cache/util.py
@@ -3,7 +3,7 @@
 # License: GPL2
 # $Id$
 
-import cache_errors
+from cache import cache_errors
 
 def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None, verbose_instance=None):