eliminate various naked except clauses

mercurial/bookmarks.py

@@ -29,7 +29,7 b' def read(repo):'
             sha, refspec = line.strip().split(' ', 1)
             refspec = encoding.tolocal(refspec)
             bookmarks[refspec] = repo.changelog.lookup(sha)
-    except:
+    except IOError:
         pass
     return bookmarks
 

mercurial/bundlerepo.py

@@ -294,7 +294,7 b' def getremotechanges(ui, repo, other, re'
     if not incoming:
         try:
             os.unlink(bundlename)
-        except:
+        except OSError:
             pass
         return other, None, None, None
 

mercurial/changelog.py

@@ -185,7 +185,7 b' class changelog(revlog.revlog):'
             try:
                 # various tools did silly things with the time zone field.
                 timezone = int(extra_data[0])
-            except:
+            except ValueError:
                 timezone = 0
             extra = {}
         else:

mercurial/cmdutil.py

@@ -293,7 +293,7 b' def addremove(repo, pats=[], opts={}, dr'
         good = True
         try:
             audit_path(abs)
-        except:
+        except (OSError, util.Abort):
             good = False
         rel = m.rel(abs)
         exact = m.exact(abs)

mercurial/context.py

@@ -805,7 +805,7 b' class workingctx(changectx):'
                 p = self._repo.wjoin(f)
                 try:
                     st = os.lstat(p)
-                except:
+                except OSError:
                     ui.warn(_("%s does not exist!\n") % join(f))
                     rejected.append(f)
                     continue

mercurial/dispatch.py

@@ -133,7 +133,7 b' def _runcatch(ui, args):'
         elif hasattr(inst, "reason"):
             try: # usually it is in the form (errno, strerror)
                 reason = inst.reason.args[1]
-            except: # it might be anything, for example a string
+            except AttributeError: # it might be anything, for example a string
                 reason = inst.reason
             ui.warn(_("abort: error: %s\n") % reason)
         elif hasattr(inst, "args") and inst.args[0] == errno.EPIPE:

mercurial/hg.py

@@ -363,7 +363,7 b' def clone(ui, source, dest=None, pull=Fa'
                 try:
                     m = dest_repo.lookup(n)
                     dest_repo._bookmarks[k] = m
-                except:
+                except error.RepoLookupError:
                     pass
             if rb:
                 bookmarks.write(dest_repo)

mercurial/localrepo.py

@@ -549,7 +549,7 b' class localrepository(repo.repository):'
         try:
             if len(key) == 20:
                 key = hex(key)
-        except:
+        except TypeError:
             pass
         raise error.RepoLookupError(_("unknown revision '%s'") % key)
 

mercurial/posix.py

@@ -59,7 +59,7 b' def set_flags(f, l, x):'
             os.unlink(f)
             try:
                 os.symlink(data, f)
-            except:
+            except OSError:
                 # failed to make a link, rewrite file
                 fp = open(f, "w")
                 fp.write(data)

mercurial/sshrepo.py

@@ -167,7 +167,7 b' class sshrepository(wireproto.wirereposi'
         self.readerr()
         try:
             l = int(l)
-        except:
+        except ValueError:
             self._abort(error.ResponseError(_("unexpected response:"), l))
         return self.pipei.read(l)
 
@@ -208,7 +208,7 b' class sshrepository(wireproto.wirereposi'
             return 1
         try:
             return int(r)
-        except:
+        except ValueError:
             self._abort(error.ResponseError(_("unexpected response:"), r))
 
 instance = sshrepository

mercurial/util.py

@@ -206,12 +206,12 b' def tempfilter(s, cmd):'
         try:
             if inname:
                 os.unlink(inname)
-        except:
+        except OSError:
             pass
         try:
             if outname:
                 os.unlink(outname)
-        except:
+        except OSError:
             pass
 
 filtertable = {
@@ -407,7 +407,7 b' def copyfile(src, dest):'
     if os.path.islink(src):
         try:
             os.unlink(dest)
-        except:
+        except OSError:
             pass
         os.symlink(os.readlink(src), dest)
     else:
@@ -556,7 +556,7 b' def checkcase(path):'
         if s2 == s1:
             return False
         return True
-    except:
+    except OSError:
         return True
 
 _fspathcache = {}

mercurial/windows.py

@@ -32,7 +32,8 b' class winstdout(object):'
     def close(self):
         try:
             self.fp.close()
-        except: pass
+        except IOError:
+            pass
 
     def write(self, s):
         try:
@@ -243,7 +244,7 b' def _removedirs(name):'
             if osutil.listdir(head):
                 return
             os.rmdir(head)
-        except:
+        except (ValueError, OSError):
             break
         head, tail = os.path.split(head)