[yum-cvs] yum output.py,1.72,1.73 yum-updatesd.py,1.26,1.27

[James Bowes]

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

Modified Files:
	output.py yum-updatesd.py 
Log Message:
Deprecate returnSimple and tagByName; use __getattr__ instead.

Index: output.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/output.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- output.py	8 Sep 2006 13:32:51 -0000	1.72
+++ output.py	23 Nov 2006 02:24:50 -0000	1.73
@@ -63,7 +63,7 @@
     def simpleList(self, pkg):
         ver = pkg.printVer()
         na = '%s.%s' % (pkg.name, pkg.arch)
-        repo = pkg.returnSimple('repoid')
+        repo = pkg.repoid
         
         print "%-40.40s %-22.22s %-16.16s" % (na, ver, repo)
     
@@ -76,9 +76,9 @@
         print _("Version: %s") % pkg.version
         print _("Release: %s") % pkg.release
         print _("Size   : %s") % self.format_number(float(pkg.size))
-        print _("Repo   : %s") % pkg.returnSimple('repoid')
-        print _("Summary: %s") % pkg.returnSimple('summary')
-        print _("Description:\n%s") % pkg.returnSimple('description')
+        print _("Repo   : %s") % pkg.repoid
+        print _("Summary: %s") % pkg.summary
+        print _("Description:\n%s") % pkg.description
         print ""
     
     def updatesObsoletesList(self, uotup, changetype):

Index: yum-updatesd.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum-updatesd.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- yum-updatesd.py	8 Nov 2006 15:23:54 -0000	1.26
+++ yum-updatesd.py	23 Nov 2006 02:24:50 -0000	1.27
@@ -366,13 +366,13 @@
             """Returns a dictionary corresponding to the package object
             in the form that we can send over the wire for dbus."""
             pkgDict = {
-                    "name": pkg.returnSimple("name"),
-                    "version": pkg.returnSimple("version"),
-                    "release": pkg.returnSimple("release"),
-                    "epoch": pkg.returnSimple("epoch"),
-                    "arch": pkg.returnSimple("arch"),
-                    "sourcerpm": pkg.returnSimple("sourcerpm"),
-                    "summary": pkg.returnSimple("summary") or "",
+                    "name": pkg.name,
+                    "version": pkg.version,
+                    "release": pkg.release,
+                    "epoch": pkg.epoch,
+                    "arch": pkg.arch,
+                    "sourcerpm": pkg.sourcerpm,
+                    "summary": pkg.summary or "",
             }
 
             # check if any updateinfo is available