Code improvements (celery#5274)

* Fix indent in base backend

* Rename letters vars in base backend

* Rename short var in riak backend

* Fix bad indent in riak backend

Author: othalla

celery/backends/base.py

@@ -169,17 +169,17 @@ def _call_task_errbacks(self, request, exc, traceback):
         for errback in request.errbacks:
             errback = self.app.signature(errback)
             if (
-                # Celery tasks type created with the @task decorator have the
-                # __header__ property, but Celery task created from Task
-                # class do not have this property.
-                # That's why we have to check if this property exists before
-                # checking is it partial function.
-                hasattr(errback.type, '__header__') and
-
-                # workaround to support tasks with bind=True executed as
-                # link errors. Otherwise retries can't be used
-                not isinstance(errback.type.__header__, partial) and
-                arity_greater(errback.type.__header__, 1)
+                    # Celery tasks type created with the @task decorator have
+                    # the __header__ property, but Celery task created from
+                    # Task class do not have this property.
+                    # That's why we have to check if this property exists
+                    # before checking is it partial function.
+                    hasattr(errback.type, '__header__') and
+
+                    # workaround to support tasks with bind=True executed as
+                    # link errors. Otherwise retries can't be used
+                    not isinstance(errback.type.__header__, partial) and
+                    arity_greater(errback.type.__header__, 1)
             ):
                 errback(request, exc, traceback)
             else:
@@ -235,9 +235,9 @@ def fail_from_current_stack(self, task_id, exc=None):
         type_, real_exc, tb = sys.exc_info()
         try:
             exc = real_exc if exc is None else exc
-            ei = ExceptionInfo((type_, exc, tb))
-            self.mark_as_failure(task_id, exc, ei.traceback)
-            return ei
+            exception_info = ExceptionInfo((type_, exc, tb))
+            self.mark_as_failure(task_id, exc, exception_info.traceback)
+            return exception_info
         finally:
             del tb
 
@@ -312,8 +312,8 @@ def prepare_expires(self, value, type=None):
     def prepare_persistent(self, enabled=None):
         if enabled is not None:
             return enabled
-        p = self.app.conf.result_persistent
-        return self.persistent if p is None else p
+        persistent = self.app.conf.result_persistent
+        return self.persistent if persistent is None else persistent
 
     def encode_result(self, result, state):
         if state in self.EXCEPTION_STATES and isinstance(result, Exception):
@@ -602,11 +602,11 @@ def _strip_prefix(self, key):
         return bytes_to_str(key)
 
     def _filter_ready(self, values, READY_STATES=states.READY_STATES):
-        for k, v in values:
-            if v is not None:
-                v = self.decode_result(v)
-                if v['status'] in READY_STATES:
-                    yield k, v
+        for k, value in values:
+            if value is not None:
+                value = self.decode_result(value)
+                if value['status'] in READY_STATES:
+                    yield k, value
 
     def _mget_to_results(self, values, keys):
         if hasattr(values, 'items'):

celery/backends/riak.py

@@ -34,21 +34,21 @@
     if sys.version_info.minor >= 7:
         warnings.warn(CeleryWarning(W_UNSUPPORTED_PYTHON_VERSION))
 
-    def to_bytes(s):
-        return s.encode() if isinstance(s, str) else s
+    def to_bytes(string):
+        return string.encode() if isinstance(string, str) else string
 
-    def str_decode(s, encoding):
-        return to_bytes(s).decode(encoding)
+    def str_decode(string, encoding):
+        return to_bytes(string).decode(encoding)
 
 else:
 
-    def str_decode(s, encoding):
-        return s.decode('ascii')
+    def str_decode(string, encoding):
+        return string.decode('ascii')
 
 
-def is_ascii(s):
+def is_ascii(string):
     try:
-        str_decode(s, 'ascii')
+        str_decode(string, 'ascii')
     except UnicodeDecodeError:
         return False
     return True
@@ -124,8 +124,8 @@ def _get_client(self):
     def _get_bucket(self):
         """Connect to our bucket."""
         if (
-            self._client is None or not self._client.is_alive() or
-            not self._bucket
+                self._client is None or not self._client.is_alive() or
+                not self._bucket
         ):
             self._bucket = self.client.bucket(self.bucket_name)
         return self._bucket