Python2.7isms

celery/result.py

@@ -671,7 +671,7 @@ class ResultSet(ResultBase):
         if not results:
             return iter([])
         return self.backend.get_many(
-            set(r.id for r in results),
+            {r.id for r in results},
             timeout=timeout, interval=interval, no_ack=no_ack,
             on_message=on_message,
         )

celery/tests/backends/test_base.py

@@ -139,7 +139,7 @@ class KVBackend(KeyValueStoreBackend):
 
     def mget(self, keys):
         if self.mget_returns_dict:
-            return dict((key, self.get(key)) for key in keys)
+            return {key: self.get(key) for key in keys}
         else:
             return [self.get(k) for k in keys]
 
@@ -273,7 +273,7 @@ class test_KeyValueStoreBackend(AppCase):
     def test_get_many(self):
         for is_dict in True, False:
             self.b.mget_returns_dict = is_dict
-            ids = dict((uuid(), i) for i in range(10))
+            ids = {uuid(): i for i in range(10)}
             for id, i in items(ids):
                 self.b.mark_as_done(id, i)
             it = self.b.get_many(list(ids))

celery/tests/case.py

@@ -721,7 +721,7 @@ def sys_platform(value):
 
 @contextmanager
 def reset_modules(*modules):
-    prev = dict((k, sys.modules.pop(k)) for k in modules if k in sys.modules)
+    prev = {k: sys.modules.pop(k) for k in modules if k in sys.modules}
     try:
         yield
     finally:

celery/tests/utils/test_saferepr.py

@@ -169,7 +169,7 @@ class test_saferepr(Case):
             (1, 2), [3, 4], {5: 6},
             tuple2((1, 2)), tuple3((1, 2)), tuple3(range(100)),
             [3, 4], list2([3, 4]), list3([3, 4]), list3(range(100)),
-            set({7}), set2({7}), set3({7}),
+            {7}, set2({7}), set3({7}),
             frozenset({8}), frozenset2({8}), frozenset3({8}),
             dict2({5: 6}), dict3({5: 6}),
             range(10, -11, -1)

docs/_ext/literals_to_xrefs.py

@@ -146,8 +146,8 @@ def colorize(text='', opts=(), **kwargs):
     """
     color_names = ('black', 'red', 'green', 'yellow',
                    'blue', 'magenta', 'cyan', 'white')
-    foreground = dict([(color_names[x], '3%s' % x) for x in range(8)])
-    background = dict([(color_names[x], '4%s' % x) for x in range(8)])
+    foreground = {color_names[x]: '3%s' % x for x in range(8)}
+    background = {color_names[x]: '4%s' % x for x in range(8)}
 
     RESET = '0'
     opt_dict = {'bold': '1',

extra/release/attribution.py

@@ -23,11 +23,11 @@ def find_missing_authors(seen):
     with open("AUTHORS") as authors:
         known = [author(line) for line in authors.readlines()]
 
-    seen_authors = set(filter(proper_name, (t[0] for t in seen)))
-    known_authors = set(t[0] for t in known)
+    seen_authors = {t[0] for t in seen if proper_name(t[0])}
+    known_authors = {t[0] for t in known}
     # maybe later?:
-    #   seen_emails = set(t[1] for t in seen)
-    #   known_emails = set(t[1] for t in known)
+    #   seen_emails = {t[1] for t in seen}
+    #   known_emails = {t[1] for t in known}
 
     pprint(seen_authors - known_authors)