Changeset a67ec83 in sasview

Timestamp:

May 2, 2017 9:02:06 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:

13fe3be

Parents:

c6bdb3b

Message:

lint

Location:

installers

Files:

• installer_generator.py (modified) (6 diffs)
• setup_mac.py (modified) (3 diffs)

installers/installer_generator.py

@@ -6 +6 @@
 from __future__ import print_function
 
-import local_config
 import os
 import string
@@ -58 +57 @@
             if ext.strip() not in ['.*', ''] and ext.strip() not in list_data:
                 list_data.append((ext, 'string', file_type))
-    except:
+    except Exception:
         pass
     try:
@@ -64 +63 @@
         if ext.strip() not in ['.', ''] and ext.strip() not in list_app:
             list_app.append((ext, 'string', file_type))
-    except:
+    except Exception:
         pass
     try:
@@ -71 +70 @@
             if ext.strip() not in ['.', ''] and ext.strip() not in list_app:
                 list_app.append((ext, 'string', file_type))
-    except:
+    except Exception:
         pass
     return list_data, list_app
@@ -170 +169 @@
     return msg
 
-def write_language(language=['english'], msfile="compiler:Default.isl"):
+def write_languages(languages=('english',), msfile="compiler:Default.isl"):
     """
     define the language of the application
     """
     msg = ''
-    if language:
+    if languages:
         msg = "\n\n[Languages]\n"
-        for lang in language:
-            msg += """Name: "%s";\tMessagesFile: "%s"\n""" % (str(lang),
-                                                           str(msfile))
+        for lang in languages:
+            msg += """Name: "%s";\tMessagesFile: "%s"\n""" % (str(lang), str(msfile))
     return msg
 
@@ -358 +356 @@
     TEMPLATE += write_registry(data_extension=DATA_EXTENSION,
                                 app_extension=APP_EXTENSION)
-    TEMPLATE += write_language()
+    TEMPLATE += write_languages()
     TEMPLATE += write_tasks()
     TEMPLATE += write_file()

installers/setup_mac.py

@@ -135 +135 @@
     """
     try:
-        list = []
+        extensions = []
         EXCEPTION_LIST = ['*', '.', '']
         from sas.sascalc.dataloader.loader import Loader
@@ -142 +142 @@
             #['All (*.*)|*.*']
             file_type, ext = string.split(item, "|*.", 1)
-            if ext.strip() not in EXCEPTION_LIST and ext.strip() not in list:
-                list.append(ext)
-    except:
+            if ext.strip() not in EXCEPTION_LIST and ext.strip() not in extensions:
+                extensions.append(ext)
+    except Exception:
         pass
     try:
         file_type, ext = string.split(local_config.APPLICATION_WLIST, "|*.", 1)
-        if ext.strip() not in EXCEPTION_LIST and ext.strip() not in list:
-            list.append(ext)
-    except:
+        if ext.strip() not in EXCEPTION_LIST and ext.strip() not in extensions:
+            extensions.append(ext)
+    except Exception:
         pass
     try:
         for item in local_config.PLUGINS_WLIST:
             file_type, ext = string.split(item, "|*.", 1)
-            if ext.strip() not in EXCEPTION_LIST and ext.strip() not in list:
-                list.append(ext)
-    except:
+            if ext.strip() not in EXCEPTION_LIST and ext.strip() not in extensions:
+                extensions.append(ext)
+    except Exception:
         pass
 
-    return list
+    return extensions
 
 EXTENSIONS_LIST = find_extension()
@@ -177 +177 @@
     if os.path.isfile(libxml_path_test):
         libxml_path = libxml_path_test
-if libxml_path == None:
+if libxml_path is None:
     raise RuntimeError, "Could not find libxml2 on the system"