matplotlib.get_home: Removing catch-all except blocks.

matplotlib · Apr 16, 2013 · ca6cd19 · ca6cd19
1 parent 941efd4
commit ca6cd19
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -479,18 +479,16 @@ def _get_home():
     """
     try:
         path = os.path.expanduser("~")
-    except:
+    except ImportError:
+        # This happens on Google App Engine (pwd module is not present).
         pass
     else:
         if os.path.isdir(path):
             return path
     for evar in ('HOME', 'USERPROFILE', 'TMP'):
-        try:
-            path = os.environ[evar]
-            if os.path.isdir(path):
-                return path
-        except:
-            pass
+        path = os.environ.get(evar)
+        if path is not None and os.path.isdir(path):
+            return path
     return None