[yum-cvs] yum/yum __init__.py,1.270,1.271 packages.py,1.85,1.86

[Jeremy Katz]

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

Modified Files:
	__init__.py packages.py 
Log Message:
* filter FutureWarnings
* mark some things as deprecation warnings


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- __init__.py	31 Jan 2007 01:26:33 -0000	1.270
+++ __init__.py	3 Feb 2007 15:37:38 -0000	1.271
@@ -46,6 +46,9 @@
 import logginglevels
 import yumRepo
 
+import warnings
+warnings.simplefilter("ignore", Errors.YumFutureDeprecationWarning)
+
 from packages import parsePackages, YumAvailablePackage, YumLocalPackage, YumInstalledPackage
 from constants import *
 
@@ -315,7 +318,7 @@
     def doSackSetup(self, archlist=None, thisrepo=None):
         """populates the package sacks for information from our repositories,
            takes optional archlist for archs to include"""
-           
+
         if self.pkgSack and thisrepo is None:
             self.verbose_logger.log(logginglevels.DEBUG_4,
                 'skipping reposetup, pkgsack exists')

Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- packages.py	25 Jan 2007 18:39:59 -0000	1.85
+++ packages.py	3 Feb 2007 15:37:38 -0000	1.86
@@ -156,8 +156,8 @@
         return out
 
     def returnSimple(self, varname):
-        warnings.warn("returnSimple() will go away in a furture version of Yum.\n",
-            DeprecationWarning, stacklevel=2)
+        warnings.warn("returnSimple() will go away in a future version of Yum.\n",
+                      Errors.YumFutureDeprecationWarning, stacklevel=2)
         return getattr(self, varname)
 
     def _pkgtup(self):
@@ -313,7 +313,7 @@
 
     def getProvidesNames(self):
         warnings.warn('getProvidesNames() will go away in a future version of Yum.\n',
-                      DeprecationWarning, stacklevel=2)
+                      Errors.YumDeprecationWarning, stacklevel=2)
         return self.provides_names
 
     filelist = property(fget=lambda self: self.returnFileEntries(ftype='file'))
@@ -483,7 +483,7 @@
     def prcoPrintable(self, prcoTuple):
         """convert the prco tuples into a nicer human string"""
         warnings.warn('prcoPrintable() will go away in a future version of Yum.\n',
-                      DeprecationWarning, stacklevel=2)
+                      Errors.YumDeprecationWarning, stacklevel=2)
         return misc.prco_tuple_to_string(prcoTuple)
 
     def requiresList(self):
@@ -641,7 +641,7 @@
     
     def tagByName(self, tag):
         warnings.warn("tagByName() will go away in a furture version of Yum.\n",
-            DeprecationWarning, stacklevel=2)
+                      Errors.YumFutureDeprecationWarning, stacklevel=2)
         try:
             return getattr(self, tag)
         except AttributeError: