[yum-cvs] yum/yum mdparser.py,1.1,1.2

Menno Smits mjs at login.linux.duke.edu
Tue Mar 1 12:45:49 UTC 2005


Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv7146

Modified Files:
	mdparser.py 
Log Message:
Entry __getitem__() no longer returns None for unknown values. This was hiding
bugs when the entry parameters were being accessed with the wrong name.

'pkgid' parameter now called 'pkgId' to suit database.


Index: mdparser.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/mdparser.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mdparser.py	25 Feb 2005 19:30:23 -0000	1.1
+++ mdparser.py	1 Mar 2005 12:45:47 -0000	1.2
@@ -70,14 +70,7 @@
         self._p = {} 
 
     def __getitem__(self, k):
-        '''Access entry data. 
-
-        Returns None by default to avoid having to set defaults for all
-        attributes.
-        '''
-        if self._p.has_key(k):
-            return self._p[k]
-        return None
+        return self._p[k]
 
     def keys(self):
         return self._p.keys()
@@ -159,7 +152,7 @@
             elif name == 'format': 
                 self.setFormat(reader)
 
-        p['pkgid'] = p['checksum_value']
+        p['pkgId'] = p['checksum_value']
 
     def setFormat(self, reader):
 
@@ -202,7 +195,7 @@
 class FilelistsEntry(BaseEntry):
     def __init__(self, reader):
         BaseEntry.__init__(self, reader)
-        self._p['pkgid'] = reader.GetAttribute('pkgid')
+        self._p['pkgId'] = reader.GetAttribute('pkgid')
         self.files = {}
 
         while reader.Read():
@@ -218,7 +211,7 @@
     def __init__(self, reader):
         BaseEntry.__init__(self, reader)
 
-        self._p['pkgid'] = reader.GetAttribute('pkgid')
+        self._p['pkgId'] = reader.GetAttribute('pkgid')
         self._p['changelog'] = []
         while reader.Read():
             if reader.NodeType() == 15 and reader.LocalName() == 'package':




More information about the Yum-cvs-commits mailing list