@@ -882,38 +882,6 @@ def discojson_t(t, resource, icon_store=None):
882882 return entities
883883
884884
885- def fetch_mdjson (urls ):
886- opts = ResourceOpts ()
887- resource = Resource (None , opts )
888- for url in urls :
889- resource .add_child (url , opts )
890-
891- rp = ResourceHandler (name = "Metadata" )
892- rp .schedule (resource .children )
893- try :
894- rp .done .acquire ()
895- rp .done .wait ()
896- finally :
897- rp .done .release ()
898- rp .fetcher .stop ()
899- rp .fetcher .join ()
900-
901- entities = []
902- for child in resource .children :
903- if child .t is not None :
904- entities .extend (child .t .findall (".//{%s}EntityDescriptor" % NS ['md' ]))
905-
906- ot = entitiesdescriptor (entities , 'extra-sources' )
907-
908- entities_json_list = discojson_t (ot , resource )
909-
910- entities_json = {}
911- for e in entities_json_list :
912- entities_json [e ['entityID' ]] = e
913-
914- return entities_json
915-
916-
917885def discojson_sp (e , global_trust_info = None , global_md_sources = None ):
918886 sp = {}
919887
@@ -924,12 +892,12 @@ def discojson_sp(e, global_trust_info=None, global_md_sources=None):
924892 sp ['entityID' ] = e .get ('entityID' , None )
925893
926894 # grab metadata sources, download metadata, and translate to json
927- md_source_urls = [el .text for el in tinfo_el .findall ('.//{%s}MetadataSource' % NS ['ti' ])]
928- if len (md_source_urls ) > 0 :
929- try :
930- sp ['extra_md' ] = fetch_mdjson (md_source_urls )
931- except Exception as e :
932- raise ValueError (f"Problem interpreting metadata at { md_source_urls } : { e } " )
895+ # md_source_urls = [el.text for el in tinfo_el.findall('.//{%s}MetadataSource' % NS['ti'])]
896+ # if len(md_source_urls) > 0:
897+ # try:
898+ # sp['extra_md'] = fetch_mdjson(md_source_urls)
899+ # except Exception as e:
900+ # raise ValueError(f"Problem interpreting metadata at {md_source_urls}: {e}")
933901
934902 sp ['profiles' ] = {}
935903 # Grab trust profile emements, and translate to json
0 commit comments