[yum-git] 2 commits - rpmUtils/transaction.py yum/packageSack.py

[James Antill]

 rpmUtils/transaction.py |    3 +--
 yum/packageSack.py      |    1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit f857770e514700b4d644c02b27b86e55733d260c
Merge: 959e4a6... f006ec9...
Author: James Antill <james at and.org>
Date:   Thu Feb 14 16:37:02 2008 -0500

    Merge branch 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum
    
    * 'master' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      set() is in 2.4 and 2.5 so no need to import sets
    
    Conflicts:
    
    	yum/packageSack.py

commit 959e4a6cd3309d29033124f034a93caf06ab00d2
Author: James Antill <james at and.org>
Date:   Thu Feb 14 16:35:26 2008 -0500

    set() is in 2.4 and 2.5 so no need to import sets

diff --git a/rpmUtils/transaction.py b/rpmUtils/transaction.py
index 7e231a7..4f573e2 100644
--- a/rpmUtils/transaction.py
+++ b/rpmUtils/transaction.py
@@ -13,7 +13,6 @@
 
 import rpm
 import miscutils
-from sets import Set
 
 read_ts = None
 ts = None
@@ -124,7 +123,7 @@ class TransactionWrapper:
                 continue
             for r in h[rpm.RPMTAG_REQUIRENAME]:
                 if not req.has_key(r):
-                    req[r] = Set()
+                    req[r] = set()
                 req[r].add(tup)
      
      
diff --git a/yum/packageSack.py b/yum/packageSack.py
index d596c44..01c17c2 100644
--- a/yum/packageSack.py
+++ b/yum/packageSack.py
@@ -23,7 +23,6 @@ import warnings
 import re
 import fnmatch
 import misc
-from sets import Set
 
 class PackageSackBase(object):
     """Base class that provides the interface for PackageSacks."""
@@ -226,7 +225,7 @@ class PackageSackBase(object):
                 continue
             for r in po.requires_names:
                 if not req.has_key(r):
-                    req[r] = Set()
+                    req[r] = set()
                 req[r].add(po)