Commits

Michał Górny committed 3d286b6

Make PackageDepSet a subclass of AllOfDep.

Comments (0)

Files changed (4)

gentoopm/basepm/depend.py

 class PMUncondOneOfDep(PMOneOfDep, PMUncondBaseDep):
 	pass
 
-class PMPackageDepSet(PMBaseDep):
+class PMPackageDepSet(PMAllOfDep):
 	"""
-	A base class representing a depset of a single package.
+	A base class representing a depset (or depset-like variable) of a single
+	package.
 	"""
 
 	@property

gentoopm/paludispm/depend.py

 	def enabled(self):
 		return self._deps.condition_met(self._pkg._env, self._pkg._pkg)
 
-class PaludisPackageDepSet(PMPackageDepSet, PaludisBaseDep):
+class PaludisPackageDepSet(PMPackageDepSet, PaludisAllOfDep):
 	pass

gentoopm/pkgcorepm/depend.py

 	def enabled(self):
 		return self._deps.restriction.match(self._pkg.use)
 
-class PkgCorePackageDepSet(PMPackageDepSet, PkgCoreBaseDep):
+class PkgCorePackageDepSet(PMPackageDepSet, PkgCoreAllOfDep):
 	@property
 	def without_conditionals(self):
-		return PkgCoreUncondPackageDepSet(
+		return PkgCoreUncondAllOfDep(
 				self._deps.evaluate_depset(self._pkg.use))
 
 class PkgCoreUncondDep(PkgCoreBaseDep):
 
 class PkgCoreUncondAllOfDep(PMAllOfDep, PkgCoreUncondDep):
 	pass
-
-class PkgCoreUncondPackageDepSet(PkgCoreUncondDep):
-	pass

gentoopm/portagepm/depend.py

 
 	@property
 	def without_conditionals(self):
-		return PortageUncondPackageDepSet(
+		return PortageUncondAllOfDep(
 				use_reduce(self._depstr, self._puse))
 
 class PortageUncondDep(PortageBaseDep):
 
 class PortageUncondAllOfDep(PMAllOfDep, PortageUncondDep):
 	pass
-
-class PortageUncondPackageDepSet(PortageUncondDep):
-	pass
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.