Merge pull request #181 from njzjz/replace_exception

batch replace 'except:' with 'except Exception:'

Author: felix5572

dpdispatcher/ssh_context.py

@@ -300,7 +300,7 @@ def bind_submission(self, submission):
         # sftp = self.ssh_session.ssh.open_sftp() 
         # sftp.mkdir(self.remote_root)
         # sftp.close()
-        # except:
+        # except Exception:
         #     pass
 
     def _walk_directory(self, files, work_path, file_list, directory_list):

tests/context.py

@@ -24,7 +24,7 @@
 try:
     from dpdispatcher.dp_cloud_server import DpCloudServer
     from dpdispatcher.dp_cloud_server_context import DpCloudServerContext
-except:
+except Exception:
     pass
 from dpdispatcher.submission import Submission, Job, Task, Resources
 from dpdispatcher.machine import Machine

tests/old/test_ssh_context.py

@@ -26,14 +26,14 @@ def setUp(self) :
                                            'port': 22,
                                            'username' : getpass.getuser(),
                                            'work_path' : os.path.join(os.getcwd(), 'rmt')})
-        except:
+        except Exception:
             # for tianhe-2
             try:
                 self.ssh_session = SSHSession({'hostname' : 'localhost',
                                             'port': 5566,
                                             'username' : getpass.getuser(),
                                             'work_path' : os.path.join(os.getcwd(), 'rmt')})
-            except:
+            except Exception:
                 self.skipTest("Network error")
         self.job = SSHContext('loc', self.ssh_session)
         self.job1 = SSHContext('loc', self.ssh_session, job_uuid = self.job.job_uuid)

tests/shell/test_shell_ssh.py

@@ -24,7 +24,7 @@ def setUp(self) :
                                       'port': port,
                                       'username' : getpass.getuser(),
                                       'work_path' : os.path.join(os.getcwd(), 'rmt')})
-        except:
+        except Exception:
             ssh_session = SSHSession({'hostname' : 'localhost',
                                       'port': 5566,
                                       'username' : getpass.getuser(),