[yum-cvs] yum/yum packages.py,1.71,1.72 repos.py,1.100,1.101

[Menno Smits]

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

Modified Files:
	packages.py repos.py 
Log Message:
cleaned up Repository.setkeys as discussed on yum-devel


Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- packages.py	18 Sep 2006 20:08:06 -0000	1.71
+++ packages.py	29 Sep 2006 15:42:59 -0000	1.72
@@ -110,10 +110,9 @@
     return exactmatch, matched, unmatched
 
 class FakeRepository:
-    """Fake repositorty class for use in rpmsack package objects"""
+    """Fake repository class for use in rpmsack package objects"""
     def __init__(self, repoid):
         self.id = repoid
-        self.setkeys = []
 
     def __cmp__(self, other):
         if self.id > other.id:
@@ -122,6 +121,7 @@
             return -1
         else:
             return 0
+        
     def __hash__(self):
         return hash(self.id)
 

Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- repos.py	29 Sep 2006 04:56:09 -0000	1.100
+++ repos.py	29 Sep 2006 15:42:59 -0000	1.101
@@ -210,8 +210,6 @@
 
     def __init__(self, repoid):
         self.id = repoid
-        self.setkeys = []
-
         self.disable()
 
     def __cmp__(self, other):
@@ -230,22 +228,11 @@
         
     def setAttribute(self, key, value):
         """sets a generic attribute of this repository"""
-        self.setkeys.append(key)
         setattr(self, key, value)
 
     def getAttribute(self, key):
-        if key in self.setkeys or hasattr(self, key):
-            return getattr(self, key)
-        return None
-
-    def unsetAttribute(self, key):
-        """delete an attribute of this repository"""
-        self.setkeys.remove(key)
-        delattr(self, key)
-
-    def getAttributeKeys(self):
-        return self.setkeys
-                
+        return getattr(self, key, None)
+
     def isEnabled(self):
         enabled = self.getAttribute('enabled')
         return enabled is not None and enabled