Fixed Yahoo and Google issues

README.md

@@ -22,7 +22,7 @@ There is a file **examples.ods** there too with usage examples and possible argu
 
 You have to check the respective web sites to work out what symbol is the right one for you. If a web site doesn't have 
 the symbol/asset you want, this extension can't help you either. Having said that, I mostly look at US and West European 
-equities, ETFs and mutual funds and major FX rates - if you have issues with the data available for other asset or 
+equities, ETFs and mutual funds and major FX rates - if you have issues with the data available for other assets or 
 assets in other regions, drop me a line (best to include full URLs and possibly the same asset listed on more than one 
 site for comparison). While data for last price is most likely consistent across sites, they will differ when it comes to 
 less well defined data points.     

src/generate_metainfo.py

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

src/google.py

@@ -138,10 +138,10 @@ class Google(BaseClient):
             tick[Datacode.NAME] = self.save_wrapper(
                 lambda: html.unescape(un_span(match.group(1)).strip()))
 
-            r = '<div [^>]*>(.*?)</div>'
+            # next div is TICKER
+            r = '<div [^>]*><div [^>]*>(.*?)</div></div>'
             pattern = re.compile(r)
 
-            # first div is TICKER
             match = pattern.search(text, start)
             if not match:
                 return 'Google.getRealtime({}, {}) - no match'.format(ticker, datacode)

src/test_google.py

@@ -93,19 +93,19 @@ class Test(unittest.TestCase):
 
     def test_DE_ETF(self):
         s = financials.getRealtime('FRA:C060', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_DE_ETF LAST_PRICE {}'.format(s))
+        self.assertEqual(float, type(s), 'test_DE_ETF LAST_PRICE {}'.format(s))
 
         s = financials.getRealtime('FRA:C060', Datacode.CURRENCY.value, 'GOOGLE')
-        self.assertEqual(s, 'EUR', 'test_DE_ETF CURRENCY')
+        self.assertEqual('EUR', s, 'test_DE_ETF CURRENCY')
 
         s = financials.getRealtime('FRA:C060', Datacode.TICKER.value, 'GOOGLE')
-        self.assertEqual(s, 'C060', 'test_DE_ETF TICKER')
+        self.assertEqual('C060', s, 'test_DE_ETF TICKER')
 
         s = financials.getRealtime('FRA:C060', Datacode.EXCHANGE.value, 'GOOGLE')
-        self.assertEqual(s, 'FRA', 'test_DE_ETF EXCHANGE')
+        self.assertEqual('FRA', s, 'test_DE_ETF EXCHANGE')
 
         s = financials.getRealtime('FRA:C060', Datacode.CURRENCY.value, 'GOOGLE')
-        self.assertEqual(s, 'EUR', 'test_DE_ETF CURRENCY')
+        self.assertEqual('EUR', s, 'test_DE_ETF CURRENCY')
 
         s = financials.getRealtime('FRA:C060', Datacode.MARKET_CAP.value, 'GOOGLE')
         self.assertIsNone(s, 'test_DE_ETF MARKET_CAP {}'.format(s))

src/test_yahoo.py

@@ -165,21 +165,21 @@ class Test(unittest.TestCase):
     def test_historic_US_equity(self):
 
         s = financials.getHistoric('IBM', Datacode.LAST_PRICE.value, '2017-01-01', 'YAHOO')
-        self.assertEqual(s, 'Not a trading day \'2017-01-01\'', 'test_historic_US_equity LAST_PRICE {}'.format(s))
+        self.assertEqual('Not a trading day \'2017-01-01\'', s, 'test_historic_US_equity LAST_PRICE {}'.format(s))
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, '2017-01-01', 'YAHOO')
-        self.assertEqual(s, 'Not a trading day \'2017-01-01\'', 'test_historic_US_equity CLOSE {}'.format(s))
+        self.assertEqual('Not a trading day \'2017-01-01\'', s, 'test_historic_US_equity CLOSE {}'.format(s))
 
         s = financials.getHistoric('IBM', Datacode.LAST_PRICE.value, '2017-01-03', 'YAHOO')
-        self.assertEqual(s, 'Data doesn\'t exist - 21', 'test_historic_US_equity LAST_PRICE {}'.format(s))
+        self.assertEqual('Data doesn\'t exist - 21', s, 'test_historic_US_equity LAST_PRICE {}'.format(s))
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, '2017-01-03', 'YAHOO')
-        self.assertEqual(s, 167.190002, 'test_historic_US_equity CLOSE {}'.format(s))
+        self.assertEqual(167.190002, s, 'test_historic_US_equity CLOSE {}'.format(s))
 
         financials.yahoo.historicdata = {}
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, '2017-01-03', 'YAHOO')
-        self.assertEqual(s, 167.190002, 'test_historic_US_equity CLOSE {}'.format(s))
+        self.assertEqual(167.190002, s, 'test_historic_US_equity CLOSE {}'.format(s))
 
         directory = os.path.join(str(pathlib.Path.home()), '.financials-extension')
         ibm = os.path.join(directory, 'yahoo-IBM.csv')
@@ -191,11 +191,11 @@ class Test(unittest.TestCase):
         financials.yahoo.historicdata = {}
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, '2017-01-03', 'YAHOO')
-        self.assertEqual(s, 167.190002, 'test_historic_US_equity CLOSE {}'.format(s))
+        self.assertEqual(167.190002, s, 'test_historic_US_equity CLOSE {}'.format(s))
 
         # 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(s, 143.492233, 'test_historic_US_equity ADJ_CLOSE {}'.format(s))
+        self.assertEqual(141.637695, s, 'test_historic_US_equity ADJ_CLOSE {}'.format(s))
 
     def test_historic_UK_ETF(self):
 

src/yahoo.py

@@ -103,7 +103,7 @@ class Yahoo(BaseClient):
 
         cookies = [cookiejar.Cookie(version=0,
                                     name="B",
-                                    value="9898htldgiar5&b=3&s=gt",
+                                    value="7pbfivtfkl00m&b=3&s=if",
                                     port=None, port_specified=None,
                                     domain=".yahoo.com", domain_specified=True, domain_initial_dot=True,
                                     path="/", path_specified=True,