stop importing deprecated 'sets' module, to hush a warning in Tahoe

exarkun · Jan 16, 2011 · 1ab8a1c · 1ab8a1c
1 parent 15e3030
commit 1ab8a1c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-16  Brian Warner  <warner@lothar.com>
+
+	* foolscap/banana.py (Banana.initSend): stop importing the
+	deprecated 'sets' module, to hush warnings when used with newer
+	pythons, since we don't really need it here. We still import it
+	from foolscap/slicers/set.py to manage compatibility with older
+	code, but that's wrapped with a warning-suppressor. This is mainly
+	to help fix Tahoe's #1329.
+
 2010-12-28  Brian Warner  <warner@lothar.com>
 
 	* foolscap/_version.py: release Foolscap-0.6.0

diff --git a/foolscap/banana.py b/foolscap/banana.py
@@ -1,5 +1,5 @@
 
-import struct, sets, time
+import struct, time
 
 from twisted.internet import protocol, defer, reactor
 from twisted.python.failure import Failure
@@ -167,7 +167,7 @@ def initSend(self):
         self.openCount = 0
         self.outgoingVocabulary = {}
         self.nextAvailableOutgoingVocabularyIndex = 0
-        self.pendingVocabAdditions = sets.Set()
+        self.pendingVocabAdditions = set()
 
     def initSlicer(self):
         self.rootSlicer = self.slicerClass(self)