Rename util function for clarity

innolitics · Apr 23, 2020 · f0c7b8a · f0c7b8a
1 parent db94f23
commit f0c7b8a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/dicom_standard/extract_attributes.py b/dicom_standard/extract_attributes.py
@@ -5,7 +5,7 @@
 import sys
 
 from dicom_standard import parse_lib as pl
-from dicom_standard.table_utils import TableDictType, get_tables_from_ids
+from dicom_standard.table_utils import TableDictType, get_table_rows_from_ids
 
 COLUMN_TITLES = ['tag', 'name', 'keyword', 'valueRepresentation', 'valueMultiplicity', 'retired']
 TABLE_IDS = ['table_6-1', 'table_7-1', 'table_8-1', 'table_9-1']
@@ -24,6 +24,6 @@ def attribute_table_to_json(table: List[TableDictType]) -> List[TableDictType]:
 
 if __name__ == '__main__':
     standard = pl.parse_html_file(sys.argv[1])
-    table = get_tables_from_ids(standard, TABLE_IDS, COLUMN_TITLES)
+    table = get_table_rows_from_ids(standard, TABLE_IDS, COLUMN_TITLES)
     parsed_table_data = attribute_table_to_json(table)
     pl.write_pretty_json(parsed_table_data)
diff --git a/dicom_standard/extract_sops.py b/dicom_standard/extract_sops.py
@@ -2,7 +2,7 @@
 import sys
 
 from dicom_standard import parse_lib as pl
-from dicom_standard.table_utils import TableDictType, get_tables_from_ids
+from dicom_standard.table_utils import TableDictType, get_table_rows_from_ids
 
 COLUMN_TITLES = ['name', 'id', 'ciod']
 TABLE_IDS = ['table_B.5-1', 'table_I.4-1', 'table_GG.3-1']
@@ -37,6 +37,6 @@ def sop_table_to_json(table: List[TableDictType]) -> List[TableDictType]:
 
 if __name__ == '__main__':
     standard = pl.parse_html_file(sys.argv[1])
-    table = get_tables_from_ids(standard, TABLE_IDS, COLUMN_TITLES)
+    table = get_table_rows_from_ids(standard, TABLE_IDS, COLUMN_TITLES)
     parsed_table_data = sop_table_to_json(table)
     pl.write_pretty_json(parsed_table_data)
diff --git a/dicom_standard/table_utils.py b/dicom_standard/table_utils.py
@@ -21,7 +21,7 @@ def table_to_list(table_div: Tag) -> List[List[str]]:
             for row in pr.table_rows(table_div)]
 
 
-def get_tables_from_ids(standard: BeautifulSoup, table_ids: List[str], col_titles: List[str]) -> List[TableDictType]:
+def get_table_rows_from_ids(standard: BeautifulSoup, table_ids: List[str], col_titles: List[str]) -> List[TableDictType]:
     table_dict_list: List[TableDictType] = []
     all_tables = standard.find_all('div', class_='table')
     for table_id in table_ids: