sed -i 's/set(\[\(.*\)\])$/{\1}/g' **/*.py

tests/test_plugins.py

@@ -14,21 +14,21 @@ class B(BasePlugin):
 
 class C(BasePlugin):
     name = 'c'
-    dependencies = set(['b', 'd'])
+    dependencies = {'b', 'd'}
 
 
 class D(BasePlugin):
     name = 'd'
-    dependencies = set(['c'])
+    dependencies = {'c'}
 
 
 class E(BasePlugin):
     name = 'e'
-    dependencies = set(['a', 'd'])
+    dependencies = {'a', 'd'}
 
 class F(BasePlugin):
     name = 'f'
-    dependencies = set(['a', 'b'])
+    dependencies = {'a', 'b'}
 
 
 register_plugin(A)

tests/test_stanza_element.py

@@ -754,7 +754,7 @@ class TestElementBase(SlixTest):
         class TestStanza(ElementBase):
             name = "foo"
             namespace = "foo"
-            interfaces = set(['bar'])
+            interfaces = {'bar'}
             bool_interfaces = interfaces
 
         stanza = TestStanza()
@@ -946,7 +946,7 @@ class TestElementBase(SlixTest):
         class TestStanza(ElementBase):
             name = 'foo'
             namespace = 'test'
-            interfaces = set(['test'])
+            interfaces = {'test'}
             sub_interfaces = interfaces
             lang_interfaces = interfaces
 
@@ -972,7 +972,7 @@ class TestElementBase(SlixTest):
         class TestStanza(ElementBase):
             name = 'foo'
             namespace = 'test'
-            interfaces = set(['test'])
+            interfaces = {'test'}
             sub_interfaces = interfaces
             lang_interfaces = interfaces
 
@@ -1008,7 +1008,7 @@ class TestElementBase(SlixTest):
         class TestStanza(ElementBase):
             name = 'foo'
             namespace = 'test'
-            interfaces = set(['test'])
+            interfaces = {'test'}
             sub_interfaces = interfaces
             lang_interfaces = interfaces
 
@@ -1040,7 +1040,7 @@ class TestElementBase(SlixTest):
         class TestStanza(ElementBase):
             name = 'foo'
             namespace = 'test'
-            interfaces = set(['test'])
+            interfaces = {'test'}
             sub_interfaces = interfaces
             lang_interfaces = interfaces
 
@@ -1096,7 +1096,7 @@ class TestElementBase(SlixTest):
         class TestStanza(ElementBase):
             name = 'foo'
             namespace = 'test'
-            interfaces = set(['test'])
+            interfaces = {'test'}
             sub_interfaces = interfaces
             lang_interfaces = interfaces
 
@@ -1136,7 +1136,7 @@ class TestElementBase(SlixTest):
         class TestStanza(ElementBase):
             name = 'foo'
             namespace = 'test'
-            interfaces = set(['test'])
+            interfaces = {'test'}
             sub_interfaces = interfaces
             lang_interfaces = interfaces
 
@@ -1177,7 +1177,7 @@ class TestElementBase(SlixTest):
         class TestStanza(ElementBase):
             name = 'foo'
             namespace = 'test'
-            interfaces = set(['test'])
+            interfaces = {'test'}
             sub_interfaces = interfaces
             lang_interfaces = interfaces
 
@@ -1217,7 +1217,7 @@ class TestElementBase(SlixTest):
         class TestStanza(ElementBase):
             name = 'foo'
             namespace = 'test'
-            interfaces = set(['test'])
+            interfaces = {'test'}
             sub_interfaces = interfaces
             lang_interfaces = interfaces
 

tests/test_stanza_xep_0030.py

@@ -274,7 +274,7 @@ class TestDisco(SlixTest):
         iq['disco_info'].add_identity('client', 'pc', lang='en')
         iq['disco_info'].add_identity('client', 'pc', lang='fr')
 
-        expected = set([('client', 'pc', 'no', None)])
+        expected = {('client', 'pc', 'no', None)}
         result = iq['disco_info'].get_identities(lang='no')
         self.failUnless(result == expected,
                 "Identities do not match:\n%s\n%s" % (
@@ -336,7 +336,7 @@ class TestDisco(SlixTest):
         iq['disco_info'].add_feature('bar')
         iq['disco_info'].add_feature('baz')
 
-        expected = set(['foo', 'bar', 'baz'])
+        expected = {'foo', 'bar', 'baz'}
         self.failUnless(iq['disco_info']['features'] == expected,
                 "Features do not match:\n%s\n%s" % (
                     expected,

tests/test_stanza_xep_0050.py

@@ -51,7 +51,7 @@ class TestAdHocCommandStanzas(SlixTest):
         iq['command']['actions'] = ['prev', 'next']
 
         results = iq['command']['actions']
-        expected = set(['prev', 'next'])
+        expected = {'prev', 'next'}
         self.assertEqual(results, expected,
                          "Incorrect next actions: %s" % results)
 

tests/test_stream_xep_0050.py

@@ -25,7 +25,7 @@ class TestAdHocCommands(SlixTest):
         class TestPayload(ElementBase):
             name = 'foo'
             namespace = 'test'
-            interfaces = set(['bar'])
+            interfaces = {'bar'}
             plugin_attrib = name
 
         Command = self.xmpp['xep_0050'].stanza.Command