Tweak exchange+region handling

ranaroussi · Jan 12, 2025 · 6c0bdfd · 6c0bdfd
1 parent 0cf54a6
commit 6c0bdfd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/yfinance/const.py b/yfinance/const.py
@@ -326,11 +326,6 @@ def merge_two_level_dicts(dict1, dict2):
     return result
 
 EQUITY_SCREENER_EQ_MAP = {
-    "region": {
-        "ar","at","au","be","br","ca","ch","cl","cn","cz","de","dk","ee","eg","es","fi","fr","gb","gr",
-        "hk","hu","id","ie","il","in","is","it","jp","kr","kw","lk","lt","lv","mx","my","nl","no","nz",
-        "pe","ph","pk","pl","pt","qa","ro","ru","sa","se","sg","sr","th","tr","tw","us","ve","vn","za"
-    },
     "exchange": {
         'ar': {'BUE'},
         'at': {'VIE'},
@@ -502,6 +497,9 @@ def merge_two_level_dicts(dict1, dict2):
         "Banks"
     }
 }
+EQUITY_SCREENER_EQ_MAP['region'] = EQUITY_SCREENER_EQ_MAP['exchange'].keys()
+ordered_keys = ['region'] + [k for k in EQUITY_SCREENER_EQ_MAP.keys() if k != 'region']
+EQUITY_SCREENER_EQ_MAP = {k:EQUITY_SCREENER_EQ_MAP[k] for k in ordered_keys}
 FUND_SCREENER_EQ_MAP = {
     "exchange": {
         'us': {'NAS'}

diff --git a/yfinance/utils.py b/yfinance/utils.py
@@ -1044,7 +1044,7 @@ def generate_list_table_from_dict_universal(data: dict, bullets: bool=True, titl
                             # Don't draw bullet points:
                             current_line += '| '
                         else:
-                            current_line += ',  '
+                            current_line += '.  '
                         current_line += f"{k2}: " + k2_values_str
                     else:
                         table_add += ' '*5
@@ -1064,7 +1064,6 @@ def generate_list_table_from_dict_universal(data: dict, bullets: bool=True, titl
                                 if j < len(k2_values_str_lines)-1:
                                     table_add += "\n"
                         else:
-                            # table_add += '* '
                             if block_format:
                                 table_add += '| '
                             else:
@@ -1089,4 +1088,4 @@ def generate_list_table_from_dict_universal(data: dict, bullets: bool=True, titl
                 value_str = ', '.join(sorted(values))
                 table += ' '*5 + f"- {value_str}\n"
 
-    return table
+    return table