Ask Solem 8 years ago
parent
commit
6aead7d9c6
4 changed files with 8 additions and 8 deletions
  1. 2 2
      celery/events/cursesmon.py
  2. 1 1
      celery/local.py
  3. 3 3
      celery/utils/collections.py
  4. 2 2
      celery/utils/serialization.py

+ 2 - 2
celery/events/cursesmon.py

@@ -152,7 +152,7 @@ class CursesMonitor(object):  # pragma: no cover
     def handle_keypress(self):
         try:
             key = self.win.getkey().upper()
-        except:
+        except Exception:
             return
         key = self.keyalias.get(key) or key
         handler = self.keymap.get(key)
@@ -174,7 +174,7 @@ class CursesMonitor(object):  # pragma: no cover
         while 1:
             try:
                 return self.win.getkey().upper()
-            except:
+            except Exception:
                 pass
 
     def selection_rate_limit(self):

+ 1 - 1
celery/local.py

@@ -350,7 +350,7 @@ class PromiseProxy(Proxy):
                              '_Proxy__kwargs')):
         try:
             thing = Proxy._get_current_object(self)
-        except:
+        except Exception:
             raise
         else:
             object.__setattr__(self, '__thing', thing)

+ 3 - 3
celery/utils/collections.py

@@ -104,10 +104,10 @@ class OrderedDict(_OrderedDict):
                     link[1] = root
                     last[1] = root[0] = link
                 else:
-                    first = root[1]
+                    first_node = root[1]
                     link[0] = root
-                    link[1] = first
-                    root[1] = first[0] = link
+                    link[1] = first_node
+                    root[1] = first_node[0] = link
 
 
 class AttributeDictMixin(object):

+ 2 - 2
celery/utils/serialization.py

@@ -68,7 +68,7 @@ def find_pickleable_exception(exc, loads=pickle.loads,
         try:
             superexc = supercls(*exc_args)
             loads(dumps(superexc))
-        except:
+        except Exception:
             pass
         else:
             return superexc
@@ -163,7 +163,7 @@ def get_pickleable_etype(cls, loads=pickle.loads, dumps=pickle.dumps):
     """Get pickleable exception type."""
     try:
         loads(dumps(cls))
-    except:
+    except Exception:
         return Exception
     else:
         return cls