From 4b718529ba70e2b01df09cf501ce8d39051acc11 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 27 Aug 2010 12:25:37 -0700 Subject: Use InvalidDependString import instead of portage.exception.InvalidDependString. --- pym/_emerge/Package.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 1a786b6d2..8fdf463f9 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -88,7 +88,7 @@ class Package(Task): try: use_reduce(v, eapi=dep_eapi, is_valid_flag=dep_valid_flag, token_class=Atom) - except portage.exception.InvalidDependString as e: + except InvalidDependString as e: self._metadata_exception(k, e) k = 'PROVIDE' @@ -120,7 +120,7 @@ class Package(Task): try: check_required_use(v, (), self.iuse.is_valid_flag) - except portage.exception.InvalidDependString as e: + except InvalidDependString as e: self._invalid_metadata(k + ".syntax", "%s: %s" % (k, e)) @@ -130,7 +130,7 @@ class Package(Task): try: use_reduce(v, is_src_uri=True, eapi=eapi, \ is_valid_flag=self.iuse.is_valid_flag) - except portage.exception.InvalidDependString as e: + except InvalidDependString as e: if not self.installed: self._metadata_exception(k, e) @@ -166,7 +166,7 @@ class Package(Task): self.cpv, self.metadata) if missing_properties: masks['PROPERTIES'] = missing_properties - except portage.exception.InvalidDependString: + except InvalidDependString: # already recorded as 'invalid' pass @@ -184,7 +184,7 @@ class Package(Task): self.cpv, self.metadata) if missing_licenses: masks['LICENSE'] = missing_licenses - except portage.exception.InvalidDependString: + except InvalidDependString: # already recorded as 'invalid' pass @@ -417,7 +417,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): try: v = paren_enclose(use_reduce(v, uselist=self._pkg.use.enabled, \ is_valid_flag=self._pkg.iuse.is_valid_flag)) - except portage.exception.InvalidDependString: + except InvalidDependString: # This error should already have been registered via # self._pkg._invalid_metadata(). pass -- cgit v1.2.3-1-g7c22