[yum-cvs] yum/yum rpmsack.py,1.15,1.16 packageSack.py,1.4,1.5

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv9455/yum

Modified Files:
	rpmsack.py packageSack.py 
Log Message:
just define __iter__ once in the parent packageSack class and use the
inheritance.  also, only call returnPackages() once on __iter__


Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rpmsack.py	21 Aug 2006 20:13:01 -0000	1.15
+++ rpmsack.py	21 Aug 2006 20:16:06 -0000	1.16
@@ -51,12 +51,6 @@
         if self.ts:
             self.buildIndexes()
 
-    def __iter__(self):
-        if hasattr(self.returnPackages(), '__iter__'):
-            return self.returnPackages().__iter__()
-        else:
-            return iter(self.returnPackages())
-
     def buildIndexes(self):
         self.header_indexes = {}
         

Index: packageSack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packageSack.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- packageSack.py	26 Jun 2006 01:30:40 -0000	1.4
+++ packageSack.py	21 Aug 2006 20:16:06 -0000	1.5
@@ -27,10 +27,11 @@
         return len(self.simplePkgList())
         
     def __iter__(self):
-        if hasattr(self.returnPackages(), '__iter__'):
-            return self.returnPackages().__iter__()
+        ret = self.returnPackages()
+        if hasattr(ret, '__iter__'):
+            return ret.__iter__()
         else:
-            return iter(self.returnPackages())
+            return iter(ret)
 
     def setCompatArchs(self, compatArchs):
         raise NotImplementedError()
@@ -279,12 +280,6 @@
     def __len__(self):
         return len(self.simplePkgList())
     
-    def __iter__(self):
-        if hasattr(self.returnPackages(), '__iter__'):
-            return self.returnPackages().__iter__()
-        else:
-            return iter(self.returnPackages())
-
     def _checkIndexes(self, failure='error'):
         """check to see if the indexes are built, if not do what failure demands
            either error out or build the indexes, default is to error out"""