Merge lp:~maxb/launchpad/stop-using-deprecated-sets into lp:launchpad

[Max Bowsher]

Remove use of the deprecated sets module.

[Max Bowsher (maxb)]

The sets module is deprecated as of Python 2.6 in favour of the built-in set type, introduced in Python 2.4.

[Graham Binns (gmb)]

review: Approve (code)

[Max Bowsher (maxb)]

On hold for merging, as it will require conflict resolution with another branch which is inbound.

[Max Bowsher (maxb)]

As the mutually conflicting branch has encountered prob;ems and is back to work-in-progress, this is clear to land as soon as someone can submit it for me.

=== modified file 'database/schema/diagram.py'
--- database/schema/diagram.py	2009-10-17 14:06:03 +0000
+++ database/schema/diagram.py	2010-02-09 01:51:16 +0000
@@ -9,7 +9,6 @@
 import _pythonpath
 
 import psycopg, sys, os, re
-from sets import Set
 from security import DbSchema, CursorWrapper
 from ConfigParser import SafeConfigParser, NoOptionError
 
@@ -51,8 +50,8 @@
         '''The universe contains everything'''
         return True
 
-all_tables = Set()
-graphed_tables = Set()
+all_tables = set()
+graphed_tables = set()
 
 def tartup(filename, outfile, section):
     dot = open(filename).read()

=== modified file 'database/schema/security.py'
--- database/schema/security.py	2010-01-06 12:34:40 +0000
+++ database/schema/security.py	2010-02-09 01:51:16 +0000
@@ -10,7 +10,6 @@
 
 from itertools import chain
 import os
-import sets
 import sys
 
 import psycopg2
@@ -291,7 +290,7 @@
     # Set of all tables we have granted permissions on. After we have assigned
     # permissions, we can use this to determine what tables have been
     # forgotten about.
-    found = sets.Set()
+    found = set()
 
     # Set permissions as per config file
     for username in config.sections():
@@ -383,7 +382,7 @@
 
     # Raise an error if we have database objects lying around that have not
     # had permissions assigned.
-    forgotten = sets.Set()
+    forgotten = set()
     for obj in schema.values():
         if obj not in found:
             forgotten.add(obj)

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2010-01-20 05:42:33 +0000
+++ lib/lp/registry/model/product.py	2010-02-09 01:51:16 +0000
@@ -16,7 +16,6 @@
 import datetime
 import calendar
 import pytz
-import sets
 from sqlobject import (
     BoolCol, ForeignKey, SQLMultipleJoin, SQLObjectNotFound, StringCol)
 from storm.locals import And, Desc, Join, SQL, Store, Unicode
@@ -1090,7 +1089,7 @@
         if registrant is None:
             registrant = owner
         if licenses is None:
-            licenses = sets.Set()
+            licenses = set()
         product = Product(
             owner=owner, registrant=registrant, name=name,
             displayname=displayname, title=title, project=project,

=== modified file 'lib/lp/services/mail/sendmail.py'
--- lib/lp/services/mail/sendmail.py	2009-07-23 18:34:25 +0000
+++ lib/lp/services/mail/sendmail.py	2010-02-09 01:51:16 +0000
@@ -26,7 +26,6 @@
 
 from binascii import b2a_qp
 import sha
-import sets
 from email.Encoders import encode_base64
 from email.Utils import getaddresses, make_msgid, formatdate, formataddr
 from email.Message import Message
@@ -80,7 +79,7 @@
     to header.  The to header and envelope_to addresses may vary
     independently, and the to header cannot break Z3.
     """
-    assert (zisinstance(to_addrs, (list, tuple, sets.Set, set))
+    assert (zisinstance(to_addrs, (list, tuple, set))
             and len(to_addrs) > 0), 'Invalid To: %r' % (to_addrs,)
     for addr in to_addrs:
         assert zisinstance(addr, basestring) and bool(addr), \

=== modified file 'lib/schoolbell/icalendar.py'
--- lib/schoolbell/icalendar.py	2005-10-31 18:29:12 +0000
+++ lib/schoolbell/icalendar.py	2010-02-09 01:51:16 +0000
@@ -38,7 +38,6 @@
 import re
 import pytz
 from cStringIO import StringIO
-from sets import Set
 from schoolbell.simple import SimpleCalendarEvent
 
 _utc_tz = pytz.timezone('UTC')
@@ -892,7 +891,7 @@
         'RECUR': parse_recurrence_rule,
     }
 
-    singleton_properties = Set([
+    singleton_properties = set([
         'DTSTAMP',
         'DTSTART',
         'UID',
@@ -914,8 +913,8 @@
         'URL',
     ])
 
-    rdate_types = Set(['DATE', 'DATE-TIME', 'PERIOD'])
-    exdate_types = Set(['DATE', 'DATE-TIME'])
+    rdate_types = set(['DATE', 'DATE-TIME', 'PERIOD'])
+    exdate_types = set(['DATE', 'DATE-TIME'])
 
     def __init__(self):
         self._props = {}
@@ -1080,7 +1079,7 @@
                 del start_set[exdate]
 
         # Find out the set of all dates
-        date_set = Set(start_set)
+        date_set = set(start_set)
         duration = self.duration.days
         for d in start_set:
             for n in range(1, duration):

=== modified file 'utilities/findimports.py'
--- utilities/findimports.py	2009-10-17 14:06:03 +0000
+++ utilities/findimports.py	2010-02-09 01:51:16 +0000
@@ -38,11 +38,9 @@
 
 import os
 import sys
-import sets
 import getopt
 import compiler
 import linecache
-from sets import Set
 from compiler import ast
 from compiler.visitor import ASTVisitor
 
@@ -165,7 +163,7 @@
         self.modules = {}
         self.path = sys.path
         self._module_cache = {}
-        self._warned_about = sets.Set()
+        self._warned_about = set()
 
     def parsePathname(self, pathname):
         if os.path.isdir(pathname):
@@ -188,7 +186,7 @@
             module.imported_names = find_imports(filename)
             module.unused_names = None
         dir = os.path.dirname(filename)
-        module.imports = Set([self.findModuleOfName(name, filename, dir)
+        module.imports = set([self.findModuleOfName(name, filename, dir)
                               for name in module.imported_names])
 
     def filenameToModname(self, filename):
@@ -296,7 +294,7 @@
     def printDot(self):
         print "digraph ModuleDependencies {"
         print "  node[shape=box];"
-        allNames = Set()
+        allNames = set()
         nameDict = {}
         for n, module in enumerate(self.listModules()):
             module._dot_name = "mod%d" % n