Fix yield for US mutuals and EFTs

src/financials.py

@@ -90,7 +90,7 @@ class FinancialsImpl(unohelper.Base, Financials):
     @profile
     def getRealtime(self, ticker, datacode=None, source=None):
 
-        if ticker == 'SUPPORT':
+        if ticker == 'SUPPORT' or ticker == 'support':
             return self.support(datacode)
 
         try:

src/financials_ft.py

@@ -12,6 +12,7 @@ import logging
 import os
 import re
 import time
+import urllib.parse
 
 import dateutil.parser
 
@@ -59,9 +60,6 @@ class FT(BaseClient):
         :return:
         """
 
-        # remove white space
-        ticker = "".join(ticker.split())
-
         # use cached value for up to 60 seconds
         if ticker in self.realtime:
             tick = self.realtime[ticker]
@@ -77,7 +75,7 @@ class FT(BaseClient):
 
         asset_class = self.guess_asset_class(ticker)
 
-        url = f'https://markets.ft.com/data/{asset_class}/tearsheet/summary?s={ticker}'
+        url = f'https://markets.ft.com/data/{asset_class}/tearsheet/summary?s={urllib.parse.quote_plus(ticker)}'
 
         try:
             text = self.urlopen(url, redirect=True, data=None, headers=None)
@@ -237,7 +235,7 @@ class FT(BaseClient):
                 tick[Datacode.PREV_CLOSE] = self.save_wrapper(
                     lambda: float(html.unescape(match.group(1)).replace(',', '').strip()))
 
-            r = r'<th>\s*Average volume\s*</th><td>\s*([0-9,\.btnm]+)\s*</td>'
+            r = r'<th>\s*Average volume\s*</th><td>\s*([0-9,\.btnmk]+)\s*</td>'
             match = re.compile(r, flags=re.DOTALL).search(text, start)
             if match:
                 tick[Datacode.AVG_DAILY_VOL_3MONTH] = self.save_wrapper(
@@ -253,7 +251,7 @@ class FT(BaseClient):
                     tick[Datacode.PE_RATIO] = self.save_wrapper(
                         lambda: float(value))
 
-            r = r'<th>\s*Market cap\s*</th><td>\s*([0-9,\.btnm]+)\s*<'
+            r = r'<th>\s*Market cap\s*</th><td>\s*([0-9,\.btnmk]+)\s*<'
             match = re.compile(r, flags=re.DOTALL).search(text, start)
             if match:
                 tick[Datacode.MARKET_CAP] = self.save_wrapper(

src/financials_yahoo.py

@@ -238,6 +238,10 @@ class Yahoo(BaseClient):
                 if match:
                     tick[Datacode.CURRENCY] = match.group(1)
 
+            # fallback for yield on US mutual funds and ETFs, which is in different field
+            if not tick[Datacode.DIV_YIELD]:
+                tick[Datacode.DIV_YIELD] = float(raw(summaryDetail, 'yield'))
+
             name = price['longName'] or price['shortName']
             if name:
                 tick[Datacode.NAME] = html.unescape(str(name))

src/generate_metainfo.py

@@ -14,7 +14,7 @@ import os
 cur_dir = os.getcwd()
 
 addin_id = "com.financials.getinfo"
-addin_version = "3.0.0"
+addin_version = "3.0.3"
 addin_displayname = "Financial Market Extension"
 addin_publisher_link = "https://github.com/cmallwitz/Financials-Extension"
 addin_publisher_name = "The Publisher"

src/test_ft.py

@@ -254,6 +254,17 @@ class Test(unittest.TestCase):
         s = financials.getRealtime('ISHAX:GER', 'EX_DIV_DATE', 'FT')
         self.assertIsNone(s, 'test_DE_equity EX_DIV_DATE {}'.format(s))
 
+    def test_DK_equity(self):
+        s = financials.getRealtime('NOVO B:CPH', 'name', 'FT')
+        self.assertEqual('Novo Nordisk A/S', s, 'test_DK_equity NAME {}'.format(s))
+
+        s = financials.getRealtime('NOVO B:CPH', 'currency', 'FT')
+        self.assertEqual('DKK', s, 'test_DK_equity CURRENCY {}'.format(s))
+
+        s = financials.getRealtime('NOVO B:CPH', 'industry', 'FT')
+        self.assertEqual(str, type(s), 'test_DK_equity INDUSTRY {}'.format(s))
+        self.assertEqual('Pharmaceuticals & Biotechnology', s, 'test_DK_equity INDUSTRY {}'.format(s))
+
     def test_TY_equity(self):
         s = financials.getRealtime('6503:TYO', 'OPEN', 'FT')
         self.assertEqual(float, type(s), 'test_TY_equity OPEN {}'.format(s))

src/test_yahoo.py

@@ -123,6 +123,9 @@ class Test(unittest.TestCase):
         s = financials.getRealtime('VFIAX', Datacode.LAST_PRICE_TIME.value, 'YAHOO')
         self.assertEqual(str, type(s), 'test_realtime_US_mutuals LAST_PRICE_TIME {}'.format(s))
 
+        s = financials.getRealtime('VFIAX', Datacode.DIV_YIELD.value, 'YAHOO')
+        self.assertTrue(testutils.is_positive_float(s), 'test_realtime_US_mutuals DIV_YIELD {}'.format(s))
+
     def test_realtime_US_options(self):
 
         # symbol from https://finance.yahoo.com/quote/IBM/options?p=IBM
@@ -195,6 +198,17 @@ class Test(unittest.TestCase):
         s = financials.getRealtime('C060.DE', Datacode.EXCHANGE.value, 'YAHOO')
         self.assertEqual(s, 'GER', 'test_realtime_DE_equity EXCHANGE')
 
+    def test_DK_equity(self):
+        s = financials.getRealtime('NOVO-B.CO', 'name', 'YAHOO')
+        self.assertEqual('Novo Nordisk A/S', s, 'test_DK_equity NAME {}'.format(s))
+
+        s = financials.getRealtime('NOVO-B.CO', 'currency', 'YAHOO')
+        self.assertEqual('DKK', s, 'test_DK_equity CURRENCY {}'.format(s))
+
+        s = financials.getRealtime('NOVO-B.CO', 'industry', 'YAHOO')
+        self.assertEqual(str, type(s), 'test_DK_equity INDUSTRY {}'.format(s))
+        self.assertEqual('Biotechnology', s, 'test_DK_equity INDUSTRY {}'.format(s))
+
     def test_realtime_TY_equity(self):
         s = financials.getRealtime('6503.T', Datacode.OPEN.value, 'YAHOO')
         self.assertEqual(float, type(s), 'test_TY_equity OPEN {}'.format(s))
@@ -261,7 +275,7 @@ class Test(unittest.TestCase):
 
         # Note: quarterly dividend and splits will change past adjusted prices - will fail after the next dividend
         s = financials.getHistoric('IBM', Datacode.ADJ_CLOSE.value, '2017-01-03', 'YAHOO')
-        self.assertEqual(137.772202, s, 'test_historic_US_equity ADJ_CLOSE {}'.format(s))
+        self.assertEqual(136.249847, s, 'test_historic_US_equity ADJ_CLOSE {}'.format(s))
 
     def test_historic_UK_ETF(self):