Minor Exception cleanup

jeffwidman · jeffwidman · commit 580520bcb9dc · 2017-12-12T11:06:44.000-08:00
diff --git a/kafka/conn.py b/kafka/conn.py
@@ -47,7 +47,7 @@
         SSLWantReadError = ssl.SSLWantReadError
         SSLWantWriteError = ssl.SSLWantWriteError
         SSLZeroReturnError = ssl.SSLZeroReturnError
-    except:
+    except AttributeError:
         # support older ssl libraries
         log.warning('Old SSL module detected.'
                     ' SSL error handling may not operate cleanly.'
diff --git a/kafka/consumer/fetcher.py b/kafka/consumer/fetcher.py
@@ -478,8 +478,8 @@ def _unpack_message_set(self, tp, records):
         # caught by the generator. We want all exceptions to be raised
         # back to the user. See Issue 545
         except StopIteration as e:
-            log.exception('StopIteration raised unpacking messageset: %s', e)
-            raise Exception('StopIteration raised unpacking messageset')
+            log.exception('StopIteration raised unpacking messageset')
+            raise RuntimeError('StopIteration raised unpacking messageset')
 
     def __iter__(self):  # pylint: disable=non-iterator-returned
         return self
diff --git a/kafka/metrics/metric_name.py b/kafka/metrics/metric_name.py
@@ -50,9 +50,9 @@ def __init__(self, name, group, description=None, tags=None):
             tags (dict, optional): Additional key/val attributes of the metric.
         """
         if not (name and group):
-            raise Exception('name and group must be non-empty.')
+            raise ValueError('name and group must be non-empty.')
         if tags is not None and not isinstance(tags, dict):
-            raise Exception('tags must be a dict if present.')
+            raise ValueError('tags must be a dict if present.')
 
         self._name = name
         self._group = group
diff --git a/kafka/protocol/types.py b/kafka/protocol/types.py
@@ -148,7 +148,7 @@ def repr(self, value):
                     field_val = value[i]
                 key_vals.append('%s=%s' % (self.names[i], self.fields[i].repr(field_val)))
             return '(' + ', '.join(key_vals) + ')'
-        except:
+        except Exception:
             return repr(value)
 
 
diff --git a/test/fixtures.py b/test/fixtures.py
@@ -162,7 +162,7 @@ def open(self):
             time.sleep(backoff)
             tries += 1
         else:
-            raise Exception('Failed to start Zookeeper before max_timeout')
+            raise RuntimeError('Failed to start Zookeeper before max_timeout')
         self.out("Done!")
         atexit.register(self.close)
 
@@ -302,7 +302,7 @@ def open(self):
             time.sleep(backoff)
             tries += 1
         else:
-            raise Exception('Failed to start KafkaInstance before max_timeout')
+            raise RuntimeError('Failed to start KafkaInstance before max_timeout')
         self.out("Done!")
         self.running = True
         atexit.register(self.close)
diff --git a/test/test_failover_integration.py b/test/test_failover_integration.py
@@ -197,7 +197,7 @@ def _send_random_messages(self, producer, topic, partition, n):
             while True:
                 try:
                     producer.send_messages(topic, partition, msg.encode('utf-8'))
-                except:
+                except Exception:
                     log.exception('failure in _send_random_messages - retrying')
                     continue
                 else:
diff --git a/test/testutil.py b/test/testutil.py
@@ -113,7 +113,7 @@ def tearDown(self):
     def current_offset(self, topic, partition):
         try:
             offsets, = self.client.send_offset_request([OffsetRequestPayload(topic, partition, -1, 1)])
-        except:
+        except Exception:
             # XXX: We've seen some UnknownErrors here and can't debug w/o server logs
             self.zk.child.dump_logs()
             self.server.child.dump_logs()
