@@ -483,7 +483,7 @@ class CloudFront(object):

                     fp.write(deunicodise("\n".join(paths)+"\n"))

                 warning("Request to invalidate %d paths (max 999 supported)" % len(paths))

                 warning("All the paths are now saved in: %s" % tmp_filename)

-            except:

+            except Exception:

                 pass

             raise ParameterError("Too many paths to invalidate")

@@ -803,7 +803,7 @@ class Cmd(object):

                 try:

                     for i in inval_list['inval_list'].info['InvalidationSummary']:

                         requests.append("/".join(["cf:/", cfuri.dist_id(), i["Id"]]))

-                except:

+                except Exception:

                     continue

         for req in requests:

             cfuri = S3Uri(req)

@@ -285,7 +285,7 @@ class Config(object):

         if self._access_token_refresh:

             try:

                 self.role_config()

-            except:

+            except Exception:

                 warning("Could not refresh role")

     def aws_credential_file(self):

@@ -442,7 +442,7 @@ class Config(object):

                 shift = 0

             try:

                 value = shift and int(value[:-1]) << shift or int(value)

-            except:

+            except Exception:

                 raise ValueError("Config: value of option %s must have suffix m, k, or nothing, not '%s'" % (option, value))

         ## allow yes/no, true/false, on/off and 1/0 for boolean options

@@ -276,7 +276,7 @@ __all__.append("s3_quote")

 def checksum_sha256_file(filename, offset=0, size=None):

     try:

         hash = sha256()

-    except:

+    except Exception:

         # fallback to Crypto SHA256 module

         hash = sha256.new()

     with open(deunicodise(filename),'rb') as f:

@@ -296,7 +296,7 @@ def checksum_sha256_file(filename, offset=0, size=None):

 def checksum_sha256_buffer(buffer, offset=0, size=None):

     try:

         hash = sha256()

-    except:

+    except Exception:

         # fallback to Crypto SHA256 module

         hash = sha256.new()

     if size is None:

@@ -35,7 +35,7 @@ def _os_walk_unicode(top):

     '''

     try:

         names = os.listdir(deunicodise(top))

-    except:

+    except Exception:

         return

     dirs, nondirs = [], []

@@ -246,7 +246,7 @@ def fetch_local_list(args, is_src = False, recursive = None):

             try:

                 uid = os.geteuid()

                 gid = os.getegid()

-            except:

+            except Exception:

                 uid = 0

                 gid = 0

             loc_list["-"] = {

@@ -26,7 +26,7 @@ class HashCache(object):

             d = self.inodes[dev][inode][mtime]

             if d['size'] != size:

                 return None

-        except:

+        except Exception:

             return None

         return d['md5']

@@ -694,7 +694,7 @@ class S3(object):

             # an md5.

             try:

                 info = self.object_info(uri)

-            except:

+            except Exception:

                 info = None

             if info is not None:

@@ -1507,7 +1507,7 @@ class S3(object):

                         response["data"] = http_response.read()

                         response["size"] = size_total

                         known_error = True

-                    except:

+                    except Exception:

                         error("Cannot retrieve any response status before encountering an EPIPE or ECONNRESET exception")

                 if not known_error:

                     warning("Upload failed: %s (%s)" % (resource['uri'], e))

@@ -51,7 +51,7 @@ from logging import debug, info, warning, error

 try:

     import htmlentitydefs

-except:

+except Exception:

     # python 3 support

     import html.entities as htmlentitydefs

@@ -1369,7 +1369,7 @@ def cmd_sync_remote2local(args):

                     # Try to remove the temp file if it exists

                     if chkptfname_b:

                         os.unlink(chkptfname_b)

-                except:

+                except Exception:

                     pass

                 if allow_partial and not cfg.stop_on_error:

@@ -1466,7 +1466,7 @@ def cmd_sync_remote2local(args):

             finally:

                 try:

                     os.remove(chkptfname_b)

-                except:

+                except Exception:

                     pass

             speed_fmt = formatSize(response["speed"], human_readable = True, floating_point = True)

@@ -1560,7 +1560,7 @@ def remote_copy(s3, copy_pairs, destination_base, uploaded_objects_list=None):

             output(u"remote copy: '%s' -> '%s'" % (dst1, dst2))

             if uploaded_objects_list is not None:

                 uploaded_objects_list.append(dst2)

-        except:

+        except Exception:

             warning(u"Unable to remote copy files '%s' -> '%s'" % (dst1_uri, dst2_uri))

             failed_copy_list[dst2] = src_obj

     return (len(copy_pairs), saved_bytes, failed_copy_list)

@@ -1589,7 +1589,7 @@ def _build_attr_header(local_list, src):

             elif attr != "md5":

                 try:

                     val = getattr(local_list[src]['sr'], 'st_' + attr)

-                except:

+                except Exception:

                     val = None

             if val is not None:

                 attrs[attr] = val

@@ -2114,7 +2114,7 @@ def cmd_list_multipart(args):

     for mpupload in parseNodes(tree):

         try:

             output(u"%s\t%s\t%s\t%s" % (mpupload['LastModified'], mpupload['PartNumber'], mpupload['ETag'], mpupload['Size']))

-        except:

+        except Exception:

             pass

     return EX_OK

@@ -2615,7 +2615,7 @@ class OptionS3ACL(Option):

             else:

                 raise OptionValueError("option %s: invalid S3 ACL permission: %s (valid values: %s)" %

                     (opt, permission, ", ".join(permissions)))

-        except:

+        except Exception:

             raise OptionValueError("option %s: invalid S3 ACL format: %r" % (opt, value))

 class OptionAll(OptionMimeType, OptionS3ACL):