Merge branch 'feature-exclusive'

pull/176/head
mokaddem 2019-11-05 15:06:16 +01:00
commit 07fa7a0553
2 changed files with 6 additions and 2 deletions

View File

@ -11,7 +11,9 @@ TAXONOMY_ROOT_PATH = Path(__file__).resolve().parent.parent
def fetchTaxonomies(): def fetchTaxonomies():
taxonomiesFolder = TAXONOMY_ROOT_PATH taxonomiesFolder = TAXONOMY_ROOT_PATH
taxonomies = [] taxonomies = []
for taxonomyFile in taxonomiesFolder.glob('./*/machinetag.json'): allTaxonomies = list(taxonomiesFolder.glob('./*/machinetag.json'))
allTaxonomies.sort()
for taxonomyFile in allTaxonomies:
with open(taxonomyFile) as f: with open(taxonomyFile) as f:
taxonomy = json.load(f) taxonomy = json.load(f)
taxonomies.append(taxonomy) taxonomies.append(taxonomy)

View File

@ -11,7 +11,9 @@ TAXONOMY_ROOT_PATH = Path(__file__).resolve().parent.parent
def fetchTaxonomies(): def fetchTaxonomies():
taxonomiesFolder = TAXONOMY_ROOT_PATH taxonomiesFolder = TAXONOMY_ROOT_PATH
taxonomies = [] taxonomies = []
for taxonomyFile in taxonomiesFolder.glob('./*/machinetag.json'): allTaxonomies = list(taxonomiesFolder.glob('./*/machinetag.json'))
allTaxonomies.sort()
for taxonomyFile in allTaxonomies:
with open(taxonomyFile) as f: with open(taxonomyFile) as f:
taxonomy = json.load(f) taxonomy = json.load(f)
taxonomies.append(taxonomy) taxonomies.append(taxonomy)