Update imports to import portage.os (with unicode wrappers), and use

_unicode_encode() and _unicode_decode() where appropriate.

svn path=/main/trunk/; revision=14002

1 files changed, 6 insertions, 4 deletions

diff --git a/pym/portage/cache/anydbm.py b/pym/portage/cache/anydbm.py
index 9007a1a56..226c6d7d0 100644
--- a/pym/portage/cache/anydbm.py
+++ b/pym/portage/cache/anydbm.py
@@ -8,7 +8,8 @@ try:
 	import cPickle as pickle
 except ImportError:
 	import pickle
-import os
+from portage import _unicode_encode
+from portage import os
 import sys
 from portage.cache import fs_template
 from portage.cache import cache_errors
@@ -30,8 +31,8 @@ class database(fs_template.FsBased):
 		self._db_path = os.path.join(self.location, fs_template.gen_label(self.location, self.label)+default_db)
 		self.__db = None
 		try:
-			self.__db = anydbm_module.open(self._db_path, "w", self._perms)
-				
+			self.__db = anydbm_module.open(
+				_unicode_encode(self._db_path), 'w', self._perms)
 		except anydbm_module.error:
 			# XXX handle this at some point
 			try:
@@ -43,7 +44,8 @@ class database(fs_template.FsBased):
 			# try again if failed
 			try:
 				if self.__db == None:
-					self.__db = anydbm_module.open(self._db_path, "c", self._perms)
+					self.__db = anydbm_module.open(
+						_unicode_encode(self._db_path), 'c', self._perms)
 			except anydbm_module.error, e:
 				raise cache_errors.InitializationError(self.__class__, e)
 		self._ensure_access(self._db_path)