Merge pull request #2082 from edx/ned/dont-catch-all-exceptions

Don't catch all exceptions.

common/lib/xmodule/xmodule/contentstore/mongo.py

@@ -100,7 +100,7 @@ class MongoContentStore(ContentStore):
     def close_stream(self, handle):
         try:
             handle.close()
-        except:
+        except Exception:
             pass
 
     def export(self, location, output_directory):

common/lib/xmodule/xmodule/contentstore/utils.py

@@ -45,5 +45,5 @@ def restore_asset_from_trashcan(location):
         try:
             thumbnail_content = trash.find(content.thumbnail_location)
             store.save(thumbnail_content)
-        except:
+        except Exception:
             pass  # OK if this is left dangling