Make 3.5 python compatability and more robust metadata testing

Author: tmorrell

caltechdata_api/decustomize_schema.py

@@ -91,8 +91,9 @@ def decustomize_schema(json_record):
                     new = {}
                     new['nameIdentifier'] =\
                         cid.pop('contributorIdentifier')
-                    new['nameIdentifierScheme'] =\
-                        cid.pop('contributorIdentifierScheme')
+                    if 'contributorIdentifierScheme' in cid:
+                        new['nameIdentifierScheme'] =\
+                            cid.pop('contributorIdentifierScheme')
                     newa.append(new)
                 c['nameIdentifiers']=newa
                 del c['contributorIdentifiers']

caltechdata_api/get_metadata.py

@@ -13,9 +13,9 @@ def get_metadata(idv,production=True):
     r = requests.get(api_url+str(idv))
     r_data = r.json()
     if 'message' in r_data:
-        raise AssertionError(f'id {idv} expected http status 200, got {r_data.status} {r_data.message}')
+        raise AssertionError('id '+idv+' expected http status 200, got '+r_data.status+r_data.message)
     if not 'metadata' in r_data:
-        raise AssertionError(f'expected as metadata property in response, got {r_data}')
+        raise AssertionError('expected as metadata property in response, got '+r_data)
     metadata = r_data['metadata']
     metadata = decustomize_schema(metadata)