Add a new portage.util.shlex_split() function to wrap all shlex.split() calls,

since shlex.split() doesn't behave well with unicode strings.

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

2 files changed, 4 insertions, 4 deletions

diff --git a/pym/portage/sets/dbapi.py b/pym/portage/sets/dbapi.py
index d6e78bfb6..0f82bd1c9 100644
--- a/pym/portage/sets/dbapi.py
+++ b/pym/portage/sets/dbapi.py
@@ -7,6 +7,7 @@ from portage.dep import Atom
 from portage.localization import _
 from portage.sets.base import PackageSet
 from portage.sets import SetConfigError, get_boolean
+import portage
 
 __all__ = ["CategorySet", "DowngradeSet",
 	"EverythingSet", "OwnerSet", "VariableSet"]
@@ -84,9 +85,8 @@ class OwnerSet(PackageSet):
 		if not "files" in options:
 			raise SetConfigError(_("no files given"))
 
-		import shlex
 		return cls(vardb=trees["vartree"].dbapi,
-			files=frozenset(shlex.split(options["files"])))
+			files=frozenset(portage.util.shlex_split(options["files"])))
 
 	singleBuilder = classmethod(singleBuilder)
 
diff --git a/pym/portage/sets/libs.py b/pym/portage/sets/libs.py
index 806cb63f6..cbaf57c27 100644
--- a/pym/portage/sets/libs.py
+++ b/pym/portage/sets/libs.py
@@ -6,6 +6,7 @@ from portage.localization import _
 from portage.sets.base import PackageSet
 from portage.sets import get_boolean
 from portage.versions import catpkgsplit
+import portage
 
 class LibraryConsumerSet(PackageSet):
 	_operations = ["merge", "unmerge"]
@@ -47,8 +48,7 @@ class LibraryFileConsumerSet(LibraryConsumerSet):
 		self._setAtoms(self.mapPathsToAtoms(consumers))
 
 	def singleBuilder(cls, options, settings, trees):
-		import shlex
-		files = tuple(shlex.split(options.get("files", "")))
+		files = tuple(portage.util.shlex_split(options.get("files", "")))
 		if not files:
 			raise SetConfigError(_("no files given"))
 		debug = get_boolean(options, "debug", False)