Changeset b39d32d5 in sasview for src/sas

Timestamp:

Aug 31, 2017 2:45:51 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

460d3a1

Parents:

a2a1c20

Message:

linting

File:

• src/sas/sasview/sasview.py (modified) (8 diffs)

src/sas/sasview/sasview.py

@@ -50 +50 @@
             self.gui.add_perspective(fitting_plug)
         except Exception:
-            logger.error("%s: could not find Fitting plug-in module"% APP_NAME)
+            logger.error("%s: could not find Fitting plug-in module", APP_NAME)
             logger.error(traceback.format_exc())
 
@@ -58 +58 @@
             pr_plug = module.Plugin()
             self.gui.add_perspective(pr_plug)
-        except:
-            logger.error("%s: could not find P(r) plug-in module"% APP_NAME)
+        except Exception:
+            logger.error("%s: could not find P(r) plug-in module", APP_NAME)
             logger.error(traceback.format_exc())
 
@@ -67 +67 @@
             invariant_plug = module.Plugin()
             self.gui.add_perspective(invariant_plug)
-        except Exception as e :
-            logger.error("%s: could not find Invariant plug-in module"% \
-                          APP_NAME)
+        except Exception:
+            logger.error("%s: could not find Invariant plug-in module",
+                         APP_NAME)
             logger.error(traceback.format_exc())
 
@@ -77 +77 @@
             corfunc_plug = module.Plugin()
             self.gui.add_perspective(corfunc_plug)
-        except:
+        except Exception:
             logger.error("Unable to load corfunc module")
 
@@ -85 +85 @@
             calculator_plug = module.Plugin()
             self.gui.add_perspective(calculator_plug)
-        except:
-            logger.error("%s: could not find Calculator plug-in module"% \
-                                                        APP_NAME)
+        except Exception:
+            logger.error("%s: could not find Calculator plug-in module",
+                         APP_NAME)
             logger.error(traceback.format_exc())
 
@@ -95 +95 @@
             converter_plug = module.Plugin()
             self.gui.add_perspective(converter_plug)
-        except:
-            logger.error("%s: could not find File Converter plug-in module"% \
-                                                        APP_NAME)
+        except Exception:
+            logger.error("%s: could not find File Converter plug-in module",
+                         APP_NAME)
             logger.error(traceback.format_exc())
 
@@ -132 +132 @@
     WX_ENV_VAR = "SASVIEW_WX_VERSION"
     if WX_ENV_VAR in os.environ:
-        logger.info("You have set the %s environment variable to %s." % \
-                     (WX_ENV_VAR, os.environ[WX_ENV_VAR]))
+        logger.info("You have set the %s environment variable to %s.",
+                    WX_ENV_VAR, os.environ[WX_ENV_VAR])
         import wxversion
         if wxversion.checkInstalled(os.environ[WX_ENV_VAR]):
-            logger.info("Version %s of wxPython is installed, so using that version." % os.environ[WX_ENV_VAR])
+            logger.info("Version %s of wxPython is installed, so using that version.",
+                        os.environ[WX_ENV_VAR])
             wxversion.select(os.environ[WX_ENV_VAR])
         else:
-            logger.error("Version %s of wxPython is not installed, so using default version." % os.environ[WX_ENV_VAR])
+            logger.error("Version %s of wxPython is not installed, so using default version.",
+                         os.environ[WX_ENV_VAR])
     else:
-        logger.info("You have not set the %s environment variable, so using default version of wxPython." % WX_ENV_VAR)
+        logger.info("You have not set the %s environment variable, so using default version of wxPython.",
+                    WX_ENV_VAR)
 
     import wx
 
     try:
-        logger.info("Wx version: %s" % wx.__version__)
-    except:
+        logger.info("Wx version: %s", wx.__version__)
+    except AttributeError:
         logger.error("Wx version: error reading version")
 
@@ -197 +200 @@
         except ImportError:
             import code
-            code.interact()
+            code.interact(local={'exit': sys.exit})
     else:
         # Run sasview as a python script interpreter