Merge pull request #35 from chicagopcdc/pcdc_dev

Pcdc dev

Author: grugna

sheepdog/blueprint/routes/views/program/__init__.py

@@ -195,7 +195,10 @@ def create_project(program):
         doc.pop("state", None)
         doc.pop("released", None)
 
-        node.props.update(doc)
+        try:
+            node.props.update(doc)
+        except AttributeError as e:
+            raise UserError(f"ERROR: {e}")
 
         res_doc = dict(
             {"type": "project", "programs": {"id": program_node.node_id}}, **doc

sheepdog/utils/__init__.py

@@ -311,7 +311,7 @@ def get_suggestion(value, choices):
             message = " Did you mean '{}'?".format(suggestion)
         else:
             message = ""
-    except:  # pylint: disable=bare-except
+    except Exception:
         pass
     return message
 

sheepdog/utils/transforms/bcr_xml_to_json.py

@@ -178,7 +178,7 @@ def xpath(
             result = root.xpath(path, namespaces=self.namespaces)
         except etree.XPathEvalError:
             result = []
-        except:
+        except Exception:
             raise
         rlen = len(result)
         if rlen < 1 and expected:

tests/integration/datadict/conftest.py

@@ -156,7 +156,7 @@ def use_ssl(request):
     try:
         # one of [False, True, None]
         return request.param
-    except:
+    except Exception:
         return None
 
 
@@ -165,7 +165,7 @@ def isolation_level(request):
     try:
         # one of ["READ_COMMITTED", "REPEATABLE_READ", "SERIALIZABLE", None]
         return request.param
-    except:
+    except Exception:
         return None
 
 

tests/integration/datadict/submission/test_endpoints.py

@@ -545,7 +545,7 @@ def just_raise_exception(self):
     try:
         r = put_example_entities_together(client, submitter)
         assert len(r.json["transactional_errors"]) == 1, r.data
-    except:
+    except Exception:
         raise
 
 

tests/integration/datadictwithobjid/conftest.py

@@ -154,7 +154,7 @@ def use_ssl(request):
     try:
         # one of [False, True, None]
         return request.param
-    except:
+    except Exception:
         return None
 
 
@@ -163,7 +163,7 @@ def isolation_level(request):
     try:
         # one of ["READ_COMMITTED", "REPEATABLE_READ", "SERIALIZABLE", None]
         return request.param
-    except:
+    except Exception:
         return None
 
 

tests/integration/datadictwithobjid/submission/test_endpoints.py

@@ -580,7 +580,7 @@ def just_raise_exception(self):
     try:
         r = put_example_entities_together(client, submitter)
         assert len(r.json["transactional_errors"]) == 1, r.data
-    except:
+    except Exception:
         raise