@@ -216,7 +216,7 @@ class AMQPBackend(BaseDictBackend):
with self._create_consumer(bindings, channel) as consumer:
while ids:
r = self.drain_events(conn, consumer, timeout)
- ids ^= set(r.keys())
+ ids ^= set(r)
for ready_id, ready_meta in r.iteritems():
yield ready_id, ready_meta
@@ -365,7 +365,7 @@ class KeyValueStoreBackend(BaseDictBackend):
r = self._mget_to_results(self.mget([self.get_key_for_task(k)
for k in keys]), keys)
self._cache.update(r)
for key, value in r.iteritems():
yield key, value
if timeout and iterations * interval >= timeout:
@@ -267,7 +267,7 @@ class Scheduler(object):
def merge_inplace(self, b):
schedule = self.schedule
- A, B = set(schedule.keys()), set(b.keys())
+ A, B = set(schedule), set(b)
# Remove items from disk not in the schedule anymore.
for key in A ^ B:
@@ -249,7 +249,7 @@ class AMQShell(cmd.Cmd):
say("unknown syntax: '%s'. how about some 'help'?" % line)
def get_names(self):
- return set(self.builtins.keys() + self.amqp.keys())
+ return set(self.builtins) | set(self.amqp)
def completenames(self, text, *ignored):
"""Return all commands starting with `text`, for tab-completion."""
@@ -27,7 +27,7 @@ Please see the configuration reference for more information.
def disable_untrusted_serializers(whitelist=None):
- for name in set(registry._decoders.keys()) - set(whitelist or []):
+ for name in set(registry._decoders) - set(whitelist or []):
try:
registry.disable(name)
except SerializerNotInstalled:
@@ -8,7 +8,7 @@ ignore = frozenset(["BROKER_INSIST", "CELERYD_POOL_PUTLOCKS",
def find_undocumented_settings(directive=".. setting:: "):
- all = set(DEFAULTS.keys())
+ all = set(DEFAULTS)
documented = set(line.strip()[len(directive):].strip()
for line in input()
if line.strip().startswith(directive))