From e1972777d0bea3f412d65c5097a92c6cf9baf768 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 31 Jul 2011 15:33:41 +0000
Subject: [PATCH] Remove PackageListing class.

---
 pakfire/base.py              | 27 +++++++++-------------
 pakfire/packages/__init__.py |  1 -
 pakfire/packages/listing.py  | 44 ------------------------------------
 po/POTFILES.in               |  1 -
 po/pakfire.pot               |  2 +-
 5 files changed, 12 insertions(+), 63 deletions(-)
 delete mode 100644 pakfire/packages/listing.py

diff --git a/pakfire/base.py b/pakfire/base.py
index 0abd7df29..3381eb671 100644
--- a/pakfire/base.py
+++ b/pakfire/base.py
@@ -255,9 +255,13 @@ class Pakfire(object):
 			solvs = self.pool.search(pattern, satsolver.SEARCH_GLOB, "solvable:name")
 
 			for solv in solvs:
-				pkgs.append(packages.SolvPackage(self, solv))
+				pkg = packages.SolvPackage(self, solv)
+				if pkg in pkgs:
+					continue
+
+				pkgs.append(pkg)
 
-		return packages.PackageListing(pkgs)
+		return sorted(pkgs)
 
 	def search(self, pattern):
 		# Do the search.
@@ -374,22 +378,13 @@ class Pakfire(object):
 	def provides(self, patterns):
 		pkgs = []
 		for pattern in patterns:
-			pkgs += self.repos.whatprovides(pattern)
-
-		pkgs = packages.PackageListing(pkgs)
-		#pkgs.unique()
-
-		return pkgs
-
-	def requires(self, patterns):
-		pkgs = []
-		for pattern in patterns:
-			pkgs += self.repos.get_by_requires(pattern)
+			for pkg in self.repos.whatprovides(pattern):
+				if pkg in pkgs:
+					continue
 
-		pkgs = packages.PackageListing(pkgs)
-		#pkgs.unique()
+				pkgs.append(pkg)
 
-		return pkgs
+		return sorted(pkgs)
 
 	def repo_create(self, path, input_paths, type="binary"):
 		assert type in ("binary", "source",)
diff --git a/pakfire/packages/__init__.py b/pakfire/packages/__init__.py
index f1bc47b70..6b7ff1898 100644
--- a/pakfire/packages/__init__.py
+++ b/pakfire/packages/__init__.py
@@ -9,7 +9,6 @@ from solv import SolvPackage
 from source import SourcePackage
 from virtual import VirtualPackage
 
-from listing import PackageListing
 from make import Makefile
 from packager import BinaryPackager
 
diff --git a/pakfire/packages/listing.py b/pakfire/packages/listing.py
deleted file mode 100644
index bdaaeee0b..000000000
--- a/pakfire/packages/listing.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/python
-
-import logging
-
-class PackageListing(object):
-	def __init__(self, packages=[]):
-		self.__packages = []
-
-		if packages:
-			for package in packages:
-				self.__packages.append(package)
-
-		self.__packages.sort()
-
-	def __repr__(self):
-		return "<PackageListing (%d) %s>" % (len(self.__packages),
-			[p.friendly_name for p in self.__packages])
-
-	def __iter__(self):
-		return iter(self.__packages)
-
-	def __len__(self):
-		return len(self.__packages)
-
-	def get_by_name(self, name):
-		for pkg in self.__packages:
-			if pkg.name == name:
-				yield pkg
-
-	def get_most_recent(self):
-		if self.__packages:
-			return self.__packages[-1]
-
-	def unique(self):
-		pkgs = []
-
-		for pkg in self.__packages:
-			if pkg in pkgs:
-				continue
-
-			pkgs.append(pkg)
-
-		self.__packages = pkgs
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f81326557..06d0db176 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -18,7 +18,6 @@ pakfire/packages/binary.py
 pakfire/packages/file.py
 pakfire/packages/__init__.py
 pakfire/packages/installed.py
-pakfire/packages/listing.py
 pakfire/packages/make.py
 pakfire/packages/packager.py
 pakfire/packages/solv.py
diff --git a/po/pakfire.pot b/po/pakfire.pot
index 19b689f5f..f695b91dc 100644
--- a/po/pakfire.pot
+++ b/po/pakfire.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 15:12+0000\n"
+"POT-Creation-Date: 2011-07-31 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
2.39.5