[yum-cvs] yum/yum config.py,1.100,1.101

[Menno Smits]

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

Modified Files:
	config.py 
Log Message:
Commited James Bowes' inheritance fix and simplify the logic.


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- config.py	14 Sep 2006 07:05:26 -0000	1.100
+++ config.py	28 Sep 2006 12:22:36 -0000	1.101
@@ -407,14 +407,8 @@
     def optionobj(cls, name):
         '''Return the Option instance for the given name
         '''
-        # Look for Option instances in this class and base classes so that
-        # option inheritance works
-        for klass in (cls,) + cls.__bases__:
-            obj = klass.__dict__.get(name, None)
-            if obj is not None:
-                break
-
-        if obj is not None and isinstance(obj, Option):
+        obj = getattr(cls, name, None)
+        if isinstance(obj, Option):
             return obj
         else:
             raise KeyError