Fixed Yahoo and Google issues

README.md

@@ -1,10 +1,49 @@
 # Financials-Extension
 
-Extension for LibreOffice Calc to access stock market data. Currently supports Yahoo and Google.
+Extension for LibreOffice Calc to make stock market, index and FX data available in a Calc spread 
+sheet - currently supports Yahoo's, Financial Times' and Google's (without FX data) finance web sites using web scraping.
 
-Only tested this with Ubuntu 16.04 and LibreOffice 5
+### System dependencies:
 
-To Build:
+Requires the following Python 3 (used by LibreOffice) packages (on top of standard libs): dateutil, pytz, pyparsing 
+
+The following steps have worked for me on a fresh Debian installation (as root)
+- apt install python3-pip
+- pip3 install python-dateutil
+- pip3 install pytz
+- pip3 install pyparsing
+
+### Usage:
+
+Have a look at the 'releases' tab above: download a prebuild **Financials-Extension.oxt** file and load it into Calc 
+under menu item: Tools, Extension Manager...
+
+There is a file **examples.ods** there too with usage examples and possible arguments to functions.
+
+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 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.     
+
+### Dealing with missing data:
+
+First of all, a hint for using LibreCalc: if you want to refresh data you can press SHIFT-CTRL-F9 - this will force a 
+recalculation of all formulas in all sheets. 
+
+Secondly the extension saves some debug information under your user directory in a directory ".financials-extension": 
+the HTML for each stock symbol is saved in a separate file (depending on source and ticker symbol). You can open it 
+your favorite web browser (or other tools) to check if the page actually contained the information you are looking for. 
+If it does the file trace.log has a record of all calls to the extension and the value returned to LibreOffice.  
+
+### Build:
+
+You will need the LibreOffice SDK installed. 
+
+On my system I installed packages: libreoffice-dev libreoffice-java-common libreoffice-script-provider-python
+
+\# depending on your location...
 
 cd ~/tech/IdeaProjects/Financials-Extension/
 
@@ -12,5 +51,14 @@ python3 src/test_yahoo.py
 
 python3 src/test_google.py
 
+\# This builds file **Financials-Extension.oxt**
+
 ./compile.sh
 
+### Tested with:
+- Debian 10.3  / LibreOffice Calc 6.1.5.2 / Python 3.7.3
+- Ubuntu 20.04 / LibreOffice Calc 6.4.3.2 / Python 3.8.2
+- Ubuntu 19.10 / LibreOffice Calc 6.3.5.2 / Python 3.7.6
+- Ubuntu 19.04 / LibreOffice Calc 6.2 / Python 3.7.3
+- Ubuntu 18.04 / LibreOffice Calc 6 / Python 3.6.7
+- Ubuntu 16.04 / LibreOffice Calc 5 (previous versions)

compile.sh

@@ -27,6 +27,9 @@ cp -f "${PWD}"/src/financials.py "${PWD}"/build/
 cp -f "${PWD}"/src/datacode.py "${PWD}"/build/
 cp -f "${PWD}"/src/baseclient.py "${PWD}"/build/
 cp -f "${PWD}"/src/jsonParser.py "${PWD}"/build/
+cp -f "${PWD}"/src/naivehtmlparser.py "${PWD}"/build/
+cp -f "${PWD}"/src/tz.py "${PWD}"/build/
+cp -f "${PWD}"/src/ft.py "${PWD}"/build/
 cp -f "${PWD}"/src/google.py "${PWD}"/build/
 cp -f "${PWD}"/src/yahoo.py "${PWD}"/build/
 

src/baseclient.py

@@ -10,49 +10,80 @@
 
 import codecs
 import gzip
+import logging
+import os
+import pathlib
 import random
-import sys
 import select
 
-from http.client import HTTPConnection, HTTPSConnection
+from http.client import HTTPConnection, HTTPSConnection, HTTPException
 from http import cookiejar
 
 import urllib.request
 
 from datacode import Datacode
 
+logger = logging.getLogger(__name__)
+# logger.setLevel(logging.DEBUG)
 
-def log(str):
-    # print(str, file=sys.stderr)
-    pass
+
+class RedirectException(HTTPException):
+    def __init__(self, location):
+        self.location = location
+
+
+class HttpException(HTTPException):
+    def __init__(self, url, status):
+        self.url = url
+        self.status = status
 
 
 class BaseClient:
     def __init__(self):
         self.connections = {}
         self.cookies = cookiejar.CookieJar()
+        self.last_url = None
+
+        self.basedir = os.path.join(str(pathlib.Path.home()), '.financials-extension')
+        os.makedirs(self.basedir, exist_ok=True)
 
         user_agents = [
-            'Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0',
-            'Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:56.0) Gecko/20100101 Firefox/56.0',
-            'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:55.0) Gecko/20100101 Firefox/55.0'
-            'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Safari/537.36',
-            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36',
-            'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36'
+            'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:74.0) Gecko/20100101 Firefox/74.0',
+            'Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:74.0) Gecko/20100101 Firefox/74.0',
+            'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0',
+            'Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:75.0) Gecko/20100101 Firefox/75.0',
+            'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:76.0) Gecko/20100101 Firefox/76.0',
+            'Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:76.0) Gecko/20100101 Firefox/76.0',
+            'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:77.0) Gecko/20100101 Firefox/77.0',
+            'Mozilla/5.0 (Windows NT 6.3; Win64; x64; rv:77.0) Gecko/20100101 Firefox/77.0',
+
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36',
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36',
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',
+            'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.106 Safari/537.36'
         ]
 
         self.default_headers = {
             'User-Agent': random.sample(user_agents, 1)[0],
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8',
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
             'Accept-Encoding': 'gzip, deflate',
-            'Accept-Language': 'en-GB,en-US;q=0.9,en;q=0.8'
+            'Accept-Language': 'en-US,en;q=0.5',
+            'Connection': 'keep-alive',
+            'Cache-Control': 'max-age=0'
         }
 
-    def request(self, method: str, url: str, data=None, headers={}, **kwargs):
+        self.response = None
+
+    def request(self, method: str, url: str, data=None, headers={}, cookies=[], **kwargs):
 
         _headers = self.default_headers.copy()
-        for key, value in headers.items():
-            _headers[key] = value
+        if headers:
+            for key, value in headers.items():
+                _headers[key] = value
+
+        if cookies:
+            for c in cookies:
+                self.cookies.set_cookie(c)
 
         connection = None
 
@@ -66,11 +97,13 @@ class BaseClient:
             connection = None
 
         if not connection:
-            log('Creating HTTP connection --------- ----------------------------------------')
+            logger.debug('Creating connection --------------------------------------------------')
             connection = HTTPConnection(host, **kwargs) if scheme == 'http:' else HTTPSConnection(host, **kwargs)
 
-        log('Creating HTTP request ------------ ----------------------------------------')
-        log(url)
+        logger.debug('Creating request -----------------------------------------------------')
+        logger.info('url=%s', url)
+
+        self.last_url = url
 
         # generate and add cookie headers
         request = urllib.request.Request(url)
@@ -80,46 +113,66 @@ class BaseClient:
             _headers['Cookie'] = request.get_header('Cookie')
 
         for key, value in _headers.items():
-            log('{}: {}'.format(key, value))
+            logger.debug('Header: %s=%s', key, value)
 
         # request
         connection.request(method, '/' + path, data, _headers)
         response = connection.getresponse()
 
-        log('Processing HTTP response --------- ----------------------------------------')
+        logger.debug('Processing response --------------------------------------------------')
 
-        # log('response.status={}'.format(response.status))
+        # logger.debug('response.status={}'.format(response.status))
         for key, value in response.getheaders():
-            log('{}: {}'.format(key, value))
+            logger.debug('Header: %s=%s', key, value)
 
         self.cookies.extract_cookies(response, request)
         self.connections[(scheme, host)] = connection
 
         return response
 
-    def urlopen(self, url, data=None, headers={}, **kwargs):
+    def urlopen(self, url, redirect=True, data=None, headers={}, cookies=[], **kwargs):
 
-        response = self.request('POST' if data else 'GET', url, data, headers, **kwargs)
-        text = response.read()
+        self.response = self.request('POST' if data else 'GET', url, data, headers, cookies, **kwargs)
+        text = self.response.read()
 
-        if 300 <= response.status < 400:
+        # Allow two redirects: used by Yahoo for some cookie based consent
 
-            scheme, _, host, path = url.split('/', 3)
-            redirect_to = response.getheader('Location')
-            if host not in redirect_to:
-                redirect_to = scheme + '//' + host + redirect_to
+        if 300 <= self.response.status < 400:
+            location = self.response.getheader('Location')
 
-            if response.getheader('Location'):
-                response = self.request('POST' if data else 'GET', redirect_to, data, headers, **kwargs)
-                text = response.read()
+            if location and redirect:
 
-        assert response.status < 400, \
-            'HTTP Status={} Reason={} url={}'.format(response.status, response.reason, url)
+                if location.startswith('/'):
+                    scheme, _, host, path = url.split('/', 3)
+                    location = '{}//{}{}'.format(scheme, host, location)
 
-        if response.getheader('Content-Encoding') == 'gzip':
+                self.response = self.request('POST' if data else 'GET', location, data, headers, cookies, **kwargs)
+                text = self.response.read()
+
+                if 300 <= self.response.status < 400:
+                    location = self.response.getheader('Location')
+
+                    if location and redirect:
+
+                        if location.startswith('/'):
+                            scheme, _, host, path = url.split('/', 3)
+                            location = '{}//{}{}'.format(scheme, host, location)
+
+                        self.response = self.request('POST' if data else 'GET', location, data, headers, cookies, **kwargs)
+                        text = self.response.read()
+                    else:
+                        raise RedirectException(location)
+
+            else:
+                raise RedirectException(location)
+
+        if self.response.status >= 400:
+            raise HttpException(url, self.response.status)
+
+        if self.response.getheader('Content-Encoding') == 'gzip':
             text = gzip.decompress(text)
 
-        content_type = response.headers.get_content_charset()
+        content_type = self.response.headers.get_content_charset()
         if content_type is None:
             content_type = 'utf-8'
         text = codecs.decode(text, encoding=content_type, errors='ignore')
@@ -136,6 +189,9 @@ class BaseClient:
         :return: value or None
         """
 
+        if data is None:
+            return None
+
         try:
             if datacode == Datacode.PREV_CLOSE.value and Datacode.PREV_CLOSE in data:
                 return data[Datacode.PREV_CLOSE]
@@ -147,10 +203,16 @@ class BaseClient:
                 return data[Datacode.CHANGE]
 
             elif datacode == Datacode.LAST_PRICE_DATE.value and Datacode.LAST_PRICE_DATE in data:
-                return data[Datacode.LAST_PRICE_DATE].isoformat()
+                if data[Datacode.LAST_PRICE_DATE]:
+                    return data[Datacode.LAST_PRICE_DATE].isoformat()
+                else:
+                    return data[Datacode.LAST_PRICE_DATE]
 
             elif datacode == Datacode.LAST_PRICE_TIME.value and Datacode.LAST_PRICE_TIME in data:
-                return data[Datacode.LAST_PRICE_TIME].isoformat()
+                if data[Datacode.LAST_PRICE_TIME]:
+                    return data[Datacode.LAST_PRICE_TIME].isoformat()
+                else:
+                    return data[Datacode.LAST_PRICE_TIME]
 
             elif datacode == Datacode.CHANGE_IN_PERCENT.value and Datacode.CHANGE_IN_PERCENT in data:
                 return data[Datacode.CHANGE_IN_PERCENT]
@@ -164,6 +226,15 @@ class BaseClient:
             elif datacode == Datacode.LAST_PRICE.value and Datacode.LAST_PRICE in data:
                 return data[Datacode.LAST_PRICE]
 
+            elif datacode == Datacode.LOW_52_WEEK.value and Datacode.LOW_52_WEEK in data:
+                return data[Datacode.LOW_52_WEEK]
+
+            elif datacode == Datacode.HIGH_52_WEEK.value and Datacode.HIGH_52_WEEK in data:
+                return data[Datacode.HIGH_52_WEEK]
+
+            elif datacode == Datacode.MARKET_CAP.value and Datacode.MARKET_CAP in data:
+                return data[Datacode.MARKET_CAP]
+
             elif datacode == Datacode.VOLUME.value and Datacode.VOLUME in data:
                 return data[Datacode.VOLUME]
 
@@ -176,22 +247,41 @@ class BaseClient:
             elif datacode == Datacode.ADJ_CLOSE.value and Datacode.ADJ_CLOSE in data:
                 return data[Datacode.ADJ_CLOSE]
 
+            elif datacode == Datacode.SECTOR.value and Datacode.SECTOR in data:
+                return data[Datacode.SECTOR]
+
+            elif datacode == Datacode.INDUSTRY.value and Datacode.INDUSTRY in data:
+                return data[Datacode.INDUSTRY]
+
             elif datacode == Datacode.TICKER.value and Datacode.TICKER in data:
                 return data[Datacode.TICKER]
 
-            elif datacode == Datacode.EXCHANGE.value and data[Datacode.EXCHANGE]:
+            elif datacode == Datacode.EXCHANGE.value and Datacode.EXCHANGE in data:
                 return data[Datacode.EXCHANGE]
 
             elif datacode == Datacode.CURRENCY.value and Datacode.CURRENCY in data:
                 return data[Datacode.CURRENCY]
 
-            elif datacode == Datacode.NAME.value and data[Datacode.NAME]:
+            elif datacode == Datacode.NAME.value and Datacode.NAME in data:
                 return data[Datacode.NAME]
 
-            elif datacode == Datacode.TIMEZONE.value and data[Datacode.TIMEZONE]:
-                return str(data[Datacode.TIMEZONE])
+            elif datacode == Datacode.TIMEZONE.value and Datacode.TIMEZONE in data:
+                if data[Datacode.TIMEZONE] is not None and type(data[Datacode.TIMEZONE]) != str:
+                    return str(data[Datacode.TIMEZONE])
+                else:
+                    return data[Datacode.TIMEZONE]
 
         except BaseException as e:
             return 'BaseClient.return_value(\'{}\', {}) - {}'.format(data, datacode, e)
 
         return "Data doesn't exist - {}".format(datacode)
+
+    def save_wrapper(self, f):
+        try:
+            value = f()
+            logger.debug(value)
+            return value
+        except BaseException as e:
+            pass
+
+        return None

src/datacode.py

@@ -24,12 +24,19 @@ class Datacode(Enum):
 
     LAST_PRICE = 21
 
+    HIGH_52_WEEK = 24
+    LOW_52_WEEK = 26
+    MARKET_CAP = 27
+
     VOLUME = 35
     AVG_DAILY_VOL_3MOMTH = 39
 
     CLOSE = 90
     ADJ_CLOSE = 91
 
+    SECTOR = 98
+    INDUSTRY = 99
+
     TICKER = 101
     EXCHANGE = 102
     CURRENCY = 103
@@ -38,8 +45,6 @@ class Datacode(Enum):
 
     TIMESTAMP = 999
 
-    # TODO YAHOO fundInceptionDate
-
     @classmethod
     def has_value(cls, value):
-        return (any(value == item.value for item in cls))
+        return any(value == item.value for item in cls)

src/financials.py

@@ -15,9 +15,10 @@ import sys
 
 import pathlib
 import platform
+import time
+from functools import wraps
 
 import unohelper
-
 from com.financials.getinfo import Financials
 
 # Add current directory to import path
@@ -28,10 +29,32 @@ if current_dir not in sys.path:
 from datacode import Datacode
 import google
 import yahoo
+import ft
+from version import version
 
 implementation_name = "com.financials.getinfo.python.FinancialsImpl"  # as defined in Financials.xcu
 implementation_services = ("com.sun.star.sheet.AddIn",)
 
+basedir = os.path.join(str(pathlib.Path.home()), '.financials-extension')
+os.makedirs(basedir, exist_ok=True)
+
+
+def profile(fn):
+    @wraps(fn)
+    def with_profiling(*args, **kwargs):
+        start = time.perf_counter()
+        r = fn(*args, **kwargs)
+        elapsed = time.perf_counter() - start
+
+        with open(os.path.join(basedir, 'trace.log'), "a+") as text_file:
+            print(
+                f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')} {fn.__name__} *args={args[1:]} r='{r}' {(1000 * elapsed):.3f} ms",
+                file=text_file)
+
+        return r
+
+    return with_profiling
+
 
 class FinancialsImpl(unohelper.Base, Financials):
     """Define the main class for the Financials extension """
@@ -40,7 +63,9 @@ class FinancialsImpl(unohelper.Base, Financials):
         self.ctx = ctx
         self.google = google.createInstance(ctx)
         self.yahoo = yahoo.createInstance(ctx)
+        self.ft = ft.createInstance(ctx)
 
+    @profile
     def getRealtime(self, ticker, datacode=None, source=None):
 
         if ticker == 'SUPPORT':
@@ -70,14 +95,17 @@ class FinancialsImpl(unohelper.Base, Financials):
             if not Datacode.has_value(datacode):
                 return 'Datacode {} not supported'.format(datacode)
 
-            source = source.upper()
+            ticker = str(ticker).strip()
+            source = str(source).upper()
 
             if source == 'GOOGLE':
-                s = self.google.getRealtime(str(ticker).strip(), datacode)
+                s = self.google.getRealtime(ticker, datacode)
             elif source == 'YAHOO':
-                s = self.yahoo.getRealtime(str(ticker).strip(), datacode)
+                s = self.yahoo.getRealtime(ticker, datacode)
+            elif source == 'FT':
+                s = self.ft.getRealtime(ticker, datacode)
             else:
-                s = 'getRealtime:Source \'{}\' not supported'.format(source)
+                s = 'Source \'{}\' not supported'.format(source)
 
         except Exception as ex:
             return str(ex)
@@ -89,6 +117,7 @@ class FinancialsImpl(unohelper.Base, Financials):
 
         return x
 
+    @profile
     def getHistoric(self, ticker, datacode=None, date=None, source=None):
 
         if ticker == 'SUPPORT':
@@ -127,7 +156,7 @@ class FinancialsImpl(unohelper.Base, Financials):
             if type(date) == float or type(date) == int:
 
                 try:
-                    offset = int(date) # offset for 1899-12-30
+                    offset = int(date)  # offset for 1899-12-30
                     d = dateutil.parser.parse('1899-12-30') + datetime.timedelta(days=offset)
                     d = d.date().isoformat()
                 except:
@@ -144,12 +173,13 @@ class FinancialsImpl(unohelper.Base, Financials):
             else:
                 return 'Date type not supported: {} \'{}\''.format(type(date), date)
 
-            source = source.upper()
+            ticker = str(ticker).strip()
+            source = str(source).upper()
 
             if source == 'YAHOO':
                 s = self.yahoo.getHistoric(str(ticker).strip(), datacode, date)
             else:
-                s = 'getHistoric: Source \'{}\' not supported'.format(source)
+                s = 'Source \'{}\' not supported'.format(source)
 
         except Exception as ex:
             return str(ex)
@@ -161,18 +191,20 @@ class FinancialsImpl(unohelper.Base, Financials):
 
         return x
 
+    @profile
     def support(self, datacode):
 
-        s = 'ctx={}\nid(self)={}\npid={}\nuname={}\nsys.executable={}\nsys.version={}\nhome={}'.format(
+        s = 'ctx={}\nid(self)={}\nversion={}\nfile={}\ncwd={}\nhome={}\nuname={}\npid={}\nsys.executable={}\nsys.version={}'.format(
             self.ctx,
             id(self),
-            os.getpid(),
-            ' '.join(platform.uname()),
-            sys.executable,
-            sys.version.replace("\n", " "),
+            version,
+            os.path.realpath(__file__),
+            os.path.realpath(os.getcwd()),
             str(pathlib.Path.home()),
-            type(datacode),
-            str(datacode))
+            ' '.join(platform.uname()),
+            os.getpid(),
+            sys.executable,
+            sys.version.replace("\n", " "))
 
         if datacode:
             s = '{}\ntype(datacode)={}\nstr(datacode)={}'.format(
@@ -182,6 +214,7 @@ class FinancialsImpl(unohelper.Base, Financials):
 
         return s
 
+
 def createInstance(ctx):
     return FinancialsImpl(ctx)
 

src/ft.py

@@ -0,0 +1,278 @@
+#  ft.py
+#
+#  license: GNU LGPL
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3 of the License, or (at your option) any later version.
+
+import dateutil.parser
+import html
+import logging
+import os
+import re
+import time
+import traceback
+
+import jsonParser
+from baseclient import BaseClient
+from datacode import Datacode
+from tz import whois_timezone_info
+
+logger = logging.getLogger(__name__)
+# logger.setLevel(logging.DEBUG)
+
+
+def handle_abbreviations(s):
+    s = str(s).strip().replace(',', '')
+    if s.endswith('k'):
+        return float(s[:-1]) * 1000
+    elif s.endswith('m'):
+        return float(s[:-1]) * 1000000
+    elif s.endswith('bn'):
+        return float(s[:-2]) * 1000000000
+    elif s.endswith('tn'):
+        return float(s[:-2]) * 1000000000000
+    return float(s)
+
+
+class FT(BaseClient):
+
+    def __init__(self, ctx):
+        super().__init__()
+
+        self.crumb = None
+        self.realtime = {}
+        self.historicdata = {}
+        self.js = jsonParser.jsonObject
+
+    def getRealtime(self, ticker: str, datacode: int):
+
+        """
+        Retrieve data for ticker from Alpha Vantage and cache it for further lookups
+
+        :param ticker: the ticker symbol e.g. VOD.LON
+        :param datacode: the requested datacode
+        :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]
+            if time.time() - 60 < tick[Datacode.TIMESTAMP]:
+                return self._return_value(tick, datacode)
+            else:
+                del self.realtime[ticker]
+
+        if ticker not in self.realtime:
+            self.realtime[ticker] = {}
+
+        tick = self.realtime[ticker]
+
+        asset_class = self.guess_asset_class(ticker)
+
+        url = f'https://markets.ft.com/data/{asset_class}/tearsheet/summary?s={ticker}'
+
+        try:
+            text = self.urlopen(url, redirect=True, data=None, headers=None)
+            with open(os.path.join(self.basedir, f'ft-{ticker}.html'), "w") as text_file:
+                print(f"<!-- '{self.last_url}' -->\r\n\r\n{text}", file=text_file)
+        except BaseException as e:
+            logger.error(traceback.format_exc())
+            return f'FT.getRealtime({ticker}, {datacode}) - urlopen endpoint: {str(e)}'
+
+        tick[Datacode.TIMESTAMP] = time.time()
+
+        tick[Datacode.NAME] = None
+        tick[Datacode.TICKER] = None
+        tick[Datacode.CURRENCY] = None
+        tick[Datacode.LAST_PRICE] = None
+        tick[Datacode.CHANGE] = None
+        tick[Datacode.CHANGE_IN_PERCENT] = None
+        tick[Datacode.VOLUME] = None
+        tick[Datacode.LOW_52_WEEK] = None
+        tick[Datacode.HIGH_52_WEEK] = None
+        tick[Datacode.LAST_PRICE_DATE] = None
+        tick[Datacode.LAST_PRICE_TIME] = None
+        tick[Datacode.TIMEZONE] = None
+
+        tick[Datacode.OPEN] = None
+        tick[Datacode.HIGH] = None
+        tick[Datacode.LOW] = None
+        tick[Datacode.PREV_CLOSE] = None
+        tick[Datacode.MARKET_CAP] = None
+
+        tick[Datacode.EXCHANGE] = None
+        tick[Datacode.AVG_DAILY_VOL_3MOMTH] = None
+
+        try:
+            r = '<div class="mod-tearsheet-overview__header"><h1 [^>]*>(.*?)</h1>'
+            match = re.compile(r, flags=re.DOTALL).search(text)
+            if not match:
+                return None
+            start = match.span(0)[1]
+
+            tick[Datacode.NAME] = self.save_wrapper(
+                lambda: html.unescape(match.group(1)).strip())
+
+            r = '<div class="mod-tearsheet-overview__header__symbol">(?:<div [^>]*>)?<span *[^>]*>(.*?)<'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                start = match.span(0)[1]
+                tick[Datacode.TICKER] = self.save_wrapper(
+                    lambda: html.unescape(match.group(1)).strip())
+
+            r = '<div class="mod-tearsheet-overview__esi">(.*?)<i.*?</i>(.*?)<'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                start = match.span(0)[1]
+                tick[Datacode.SECTOR] = self.save_wrapper(
+                    lambda: html.unescape(match.group(1)).strip())
+                tick[Datacode.INDUSTRY] = self.save_wrapper(
+                    lambda: html.unescape(match.group(2)).strip())
+
+            r = r'<span [^>]*>Price \(([A-Z]+|--)\)</span><span [^>]*>([0-9,\.]+)</span>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                start = match.span(0)[1]
+                if match.group(1) != '--':
+                    tick[Datacode.CURRENCY] = self.save_wrapper(
+                        lambda: html.unescape(match.group(1)).strip())
+                tick[Datacode.LAST_PRICE] = self.save_wrapper(
+                    lambda: float(html.unescape(match.group(2)).replace(',', '').strip()))
+
+            r = r'<span[^>]*>Today\'s Change</span><span[^>]*><span[^>]*>(?:<i[^>]*></i>)?([0-9,\.-]+) */ *([0-9,\.-]+)%</span>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                start = match.span(0)[1]
+                tick[Datacode.CHANGE] = self.save_wrapper(
+                    lambda: float(html.unescape(match.group(1)).replace(',', '').strip()))
+                tick[Datacode.CHANGE_IN_PERCENT] = self.save_wrapper(
+                    lambda: float(html.unescape(match.group(2)).replace(',', '').strip()))
+
+            r = r'<span[^>]*>Shares traded</span><span[^>]*>([0-9mk,\.]+)</span>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                start = match.span(0)[1]
+                tick[Datacode.VOLUME] = self.save_wrapper(
+                    lambda: handle_abbreviations(html.unescape(match.group(1))))
+
+            r = r'<span[^>]*>52 week range</span><span[^>]*>([0-9,\.]+) *- *([0-9,\.]+)</span>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                start = match.span(0)[1]
+                tick[Datacode.LOW_52_WEEK] = self.save_wrapper(
+                    lambda: float(html.unescape(match.group(1)).replace(',', '').strip()))
+                tick[Datacode.HIGH_52_WEEK] = self.save_wrapper(
+                    lambda: float(html.unescape(match.group(2)).replace(',', '').strip()))
+
+            r = r'<div class="mod-disclaimer">.+?as of (.+?)\.?</div>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                start = match.span(0)[1]
+
+                try:
+                    value = html.unescape(match.group(1)).strip()
+                    dt = dateutil.parser.parse(value, tzinfos=whois_timezone_info)
+                    tick[Datacode.LAST_PRICE_DATE] = dt.date()
+                    tick[Datacode.LAST_PRICE_TIME] = dt.time()
+
+                    time_bits = value.split(' ')
+                    if len(time_bits) >= 4:
+                        tick[Datacode.TIMEZONE] = time_bits[-1]
+
+                except BaseException as e:
+                    pass
+
+            # second attempt at 52 week range
+            if Datacode.LOW_52_WEEK not in tick or not tick[Datacode.LOW_52_WEEK]:
+                r = r'<span class="mod-ui-range-bar__container__label--lo"><span[^>]*>([0-9,\.]+)</span>'
+                match = re.compile(r, flags=re.DOTALL).search(text, start)
+                if match:
+                    tick[Datacode.LOW_52_WEEK] = self.save_wrapper(
+                        lambda: float(html.unescape(match.group(1)).replace(',', '').strip()))
+
+            if Datacode.HIGH_52_WEEK not in tick or not tick[Datacode.HIGH_52_WEEK]:
+                r = r'<span class="mod-ui-range-bar__container__label--hi"><span[^>]*>([0-9,\.]+)</span>'
+                match = re.compile(r, flags=re.DOTALL).search(text, start)
+                if match:
+                    tick[Datacode.HIGH_52_WEEK] = self.save_wrapper(
+                        lambda: float(html.unescape(match.group(1)).replace(',', '').strip()))
+
+            # just moving forward to data table
+            r = '<div class="mod-tearsheet-key-stats__data__table">'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                start = match.span(0)[1]
+
+            r = r'<th>Open</th><td>([0-9,\.]+)</td>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                tick[Datacode.OPEN] = self.save_wrapper(
+                    lambda: float(html.unescape(match.group(1)).replace(',', '').strip()))
+
+            r = r'<th>High</th><td>([0-9,\.]+)</td>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                tick[Datacode.HIGH] = self.save_wrapper(
+                    lambda: float(html.unescape(match.group(1)).replace(',', '').strip()))
+
+            r = r'<th>Low</th><td>([0-9,\.]+)</td>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                tick[Datacode.LOW] = self.save_wrapper(
+                    lambda: float(html.unescape(match.group(1)).replace(',', '').strip()))
+
+            r = r'<th>\s*Previous close\s*</th><td>\s*([0-9,\.]+)\s*</td>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                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>'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                tick[Datacode.AVG_DAILY_VOL_3MOMTH] = self.save_wrapper(
+                    lambda: handle_abbreviations(html.unescape(match.group(1))))
+
+            r = r'<th>\s*Market cap\s*</th><td>\s*([0-9,\.btnm]+)\s*<'
+            match = re.compile(r, flags=re.DOTALL).search(text, start)
+            if match:
+                tick[Datacode.MARKET_CAP] = self.save_wrapper(
+                    lambda: handle_abbreviations(html.unescape(match.group(1))))
+
+        except BaseException as e:
+            logger.error(traceback.format_exc())
+            return f'FT.getRealtime({ticker}, {datacode}) - process: {str(e)}'
+
+        logger.info(tick)
+
+        return self._return_value(self.realtime[ticker], datacode)
+
+    def getHistoric(self, ticker, datacode, date):
+        return 'FT.getHistoric: Historic Data not implemented.'
+
+    def guess_asset_class(self, ticker):
+
+        if len(ticker) == 6:
+            if ticker[0:2] in ['USD', 'EUR', 'GBP', 'JPY', 'CHF']:
+                return 'currencies'
+            if ticker[3:5] in ['USD', 'EUR', 'GBP', 'JPY', 'CHF']:
+                return 'currencies'
+
+        colon_count = ticker.count(':')
+
+        if colon_count == 0:
+            return 'funds'
+        elif colon_count == 3:
+            return 'etfs'
+
+        return 'equities'
+
+
+def createInstance(ctx):
+    return FT(ctx)

src/generate_metainfo.py

@@ -10,15 +10,23 @@
 #
 
 import os
+
 cur_dir = os.getcwd()
 
 addin_id = "com.financials.getinfo"
-addin_version = "0.0.3"
+addin_version = "2.1.1"
 addin_displayname = "Financial Market Extension"
 addin_publisher_link = "https://github.com/cmallwitz/Financials-Extension"
 addin_publisher_name = "The Publisher"
 
-print ("Generating extension files for version", addin_version)
+print("Generating extension files for version", addin_version)
+
+################################################################################
+# version.py
+
+version_file = open(cur_dir + '/build/version.py', 'w')
+version_file.write(f"version = '{addin_version}'")
+version_file.close()
 
 ################################################################################
 # description.xml
@@ -35,15 +43,17 @@ desc_xml.write('    <l:LibreOffice-minimal-version value="5.0" d:name="LibreOffi
 desc_xml.write('</dependencies> \n')
 desc_xml.write('\n')
 desc_xml.write('<identifier value="' + addin_id + '" /> \n')
-desc_xml.write('<version value="' + addin_version + '" />\n')   
+desc_xml.write('<version value="' + addin_version + '" />\n')
 desc_xml.write('<display-name><name lang="en">' + addin_displayname + '</name></display-name>\n')
-desc_xml.write('<publisher><name xlink:href="' + addin_publisher_link + '" lang="en">' + addin_publisher_name + '</name></publisher>\n')
+desc_xml.write(
+    '<publisher><name xlink:href="' + addin_publisher_link + '" lang="en">' + addin_publisher_name + '</name></publisher>\n')
 desc_xml.write('<extension-description><src xlink:href="description-en-US.txt" lang="en" /></extension-description>')
 desc_xml.write('\n \n')
 desc_xml.write('</description> \n')
 
 desc_xml.close()
 
+
 ################################################################################
 # manifest.xml
 # List of files in package and their types.
@@ -53,9 +63,10 @@ def add_manifest_entry(xml_file, file_type, file_name):
     xml_file.write('<manifest:file-entry manifest:media-type="application/vnd.sun.star.' + file_type + '" \n')
     xml_file.write('    manifest:full-path="' + file_name + '"/> \n')
 
+
 manifest_xml = open(cur_dir + '/build/META-INF/manifest.xml', 'w')
 
-manifest_xml.write('<manifest:manifest>\n');
+manifest_xml.write('<manifest:manifest>\n')
 add_manifest_entry(manifest_xml, 'uno-typelibrary;type=RDB', 'XFinancials.rdb')
 add_manifest_entry(manifest_xml, 'configuration-data', 'Financials.xcu')
 add_manifest_entry(manifest_xml, 'uno-component;type=Python', 'financials.py')
@@ -63,6 +74,7 @@ manifest_xml.write('</manifest:manifest> \n')
 
 manifest_xml.close()
 
+
 ################################################################################
 # Financials.xcu
 
@@ -71,12 +83,13 @@ def define_function(xml_file, function_name, description, parameters):
     xml_file.write('    <prop oor:name="DisplayName"><value xml:lang="en">' + function_name + '</value></prop>\n')
     xml_file.write('    <prop oor:name="Description"><value xml:lang="en">' + description + '</value></prop>\n')
     xml_file.write('    <prop oor:name="Category"><value>Add-In</value></prop>\n')
-    xml_file.write('    <prop oor:name="CompatibilityName"><value xml:lang="en">AutoAddIn.Financials.' + function_name + '</value></prop>\n')
+    xml_file.write(
+        '    <prop oor:name="CompatibilityName"><value xml:lang="en">AutoAddIn.Financials.' + function_name + '</value></prop>\n')
     xml_file.write('    <node oor:name="Parameters">\n')
 
     for p, desc in parameters:
-        # Optional parameters will have a displayname enclosed in square brackets.
-        p_name = p.strip("[]")        
+        # Optional parameters will have a display name enclosed in square brackets.
+        p_name = p.strip("[]")
         xml_file.write('      <node oor:name="' + p_name + '" oor:op="replace">\n')
         xml_file.write('        <prop oor:name="DisplayName"><value xml:lang="en">' + p_name + '</value></prop>\n')
         xml_file.write('        <prop oor:name="Description"><value xml:lang="en">' + desc + '</value></prop>\n')
@@ -85,6 +98,7 @@ def define_function(xml_file, function_name, description, parameters):
     xml_file.write('    </node>\n')
     xml_file.write('  </node>\n')
 
+
 # instance_id references the named UNO component instantiated by Python code (that is my understanding at least).
 implementation_name = "com.financials.getinfo.python.FinancialsImpl"
 
@@ -94,17 +108,19 @@ excel_addin_name = "Financials.xlam"
 financials_xml = open(cur_dir + '/build/Financials.xcu', 'w')
 
 financials_xml.write('<?xml version="1.0" encoding="UTF-8"?>\n')
-financials_xml.write('<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="CalcAddIns" oor:package="org.openoffice.Office">\n')
+financials_xml.write(
+    '<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="CalcAddIns" oor:package="org.openoffice.Office">\n')
 financials_xml.write('<node oor:name="AddInInfo">\n')
 financials_xml.write('<node oor:name="' + implementation_name + '" oor:op="replace">\n')
 financials_xml.write('<node oor:name="AddInFunctions">\n')
 
-define_function(financials_xml, \
-    'getRealtime', 'Fetches Realtime Financial Data.', \
+define_function(financials_xml,
+                'getRealtime', 'Fetches Realtime Financial Data.',
                 [('ticker', 'The ticker symbol.'), ('datacode', 'The data code.'), ('source', 'The source.')])
-define_function(financials_xml, \
-    'getHistoric', 'Fetches Historic Financial Data.', \
-                [('ticker', 'The ticker symbol.'), ('datacode', 'The data code.'), ('date', 'The date.'), ('source', 'The source.')])
+define_function(financials_xml,
+                'getHistoric', 'Fetches Historic Financial Data.',
+                [('ticker', 'The ticker symbol.'), ('datacode', 'The data code.'), ('date', 'The date.'),
+                 ('source', 'The source.')])
 
 financials_xml.write('</node>\n')
 financials_xml.write('</node>\n')

src/google.py

@@ -8,30 +8,39 @@
 #  version 3 of the License, or (at your option) any later version.
 
 
-import datetime
-import locale
+import dateutil
 import html
+import logging
+import os
 import re
-import sys
 import time
 import traceback
+import xml.etree.ElementTree as ET
 
-import urllib.parse
-
+from baseclient import BaseClient, RedirectException
 from datacode import Datacode
-from baseclient import BaseClient
+from naivehtmlparser import NaiveHTMLParser
+from tz import whois_timezone_info
+
+logger = logging.getLogger(__name__)
 
 
-def log(str):
-    # print(str, file=sys.stderr)
-    pass
+# logger.setLevel(logging.DEBUG)
 
-# TODO migrate to:
-# https://www.google.com/search?q=NYSE:IBM&tbm=fin
-# https://www.google.com/search?q=NASDAQ:INTC&tbm=fin
-# https://www.google.com/search?q=LON:VOD&tbm=fin
-# https://www.google.com/search?q=EURGBP
-# https://www.google.com/search?q=INDEXSP:.INX
+
+def handle_abbreviations(s):
+    s = str(s).strip()
+    if s.endswith('M'):
+        return float(s[:-1]) * 1000000
+    elif s.endswith('B'):
+        return float(s[:-1]) * 1000000000
+    elif s.endswith('T'):
+        return float(s[:-1]) * 1000000000000
+    return float(s)
+
+
+def un_span(s):
+    return re.sub(r'<span [^>]*>', '', s).replace('</span>', '')
 
 
 class Google(BaseClient):
@@ -39,13 +48,14 @@ class Google(BaseClient):
         super().__init__()
 
         self.realtime = {}
+        self.location = None
 
     def getRealtime(self, ticker: str, datacode: int):
 
         """
         Retrieve realtime data for ticker from Google Finance and cache it for further lookups
 
-        :param ticker: the ticker symbol e.g. VOD.L or LON:VOD
+        :param ticker: the ticker symbol e.g. LON:VOD
         :param datacode: the requested datacode
         :return:
         """
@@ -61,101 +71,188 @@ class Google(BaseClient):
             else:
                 del self.realtime[ticker]
 
-        url = 'https://finance.google.com/finance?{}'.format(urllib.parse.urlencode({'q': ticker}))
+        q_param = 'q=' + ticker
+
+        if not self.location:
+            url = 'https://www.google.com/search?hl=en&tbm=fin&' + q_param
+
+            try:
+                self.urlopen(url, redirect=False)
+            except RedirectException as e:
+                self.location = e.location.replace('&' + q_param, '')
+            except BaseException as e:
+                logger.error(traceback.format_exc())
+                return 'Google.getRealtime(\'{}\', {}) - location: {}'.format(ticker, datacode, e)
+
+        if not self.location:
+            url = 'https://www.google.com/search?tbm=fin&' + q_param
+        else:
+            url = self.location + '&' + q_param
 
         try:
             text = self.urlopen(url)
+            with open(os.path.join(self.basedir, 'google-{}.html'.format(ticker)), "w") as text_file:
+                print(f"<!-- '{url}' -->\r\n\r\n{text}", file=text_file)
         except BaseException as e:
-            log(traceback.format_exc())
-            return 'Google.getRealtime(\'{}\', {}) - read: {}'.format(ticker, datacode, e)
+            logger.error(traceback.format_exc())
+            return 'Google.getRealtime(\'{}\', {}) - urlopen: {} {}'.format(ticker, datacode, e, url)
+
+        if ticker not in self.realtime:
+            self.realtime[ticker] = {}
+
+        tick = self.realtime[ticker]
+
+        tick[Datacode.TIMESTAMP] = time.time()
+
+        tick[Datacode.NAME] = None
+        tick[Datacode.TICKER] = None
+        tick[Datacode.CURRENCY] = None
+        tick[Datacode.LAST_PRICE] = None
+        tick[Datacode.CHANGE] = None
+        tick[Datacode.CHANGE_IN_PERCENT] = None
+        tick[Datacode.VOLUME] = None
+        tick[Datacode.LOW_52_WEEK] = None
+        tick[Datacode.HIGH_52_WEEK] = None
+        tick[Datacode.LAST_PRICE_DATE] = None
+        tick[Datacode.LAST_PRICE_TIME] = None
+        tick[Datacode.TIMEZONE] = None
+
+        tick[Datacode.OPEN] = None
+        tick[Datacode.HIGH] = None
+        tick[Datacode.LOW] = None
+        tick[Datacode.PREV_CLOSE] = None
+        tick[Datacode.MARKET_CAP] = None
+
+        tick[Datacode.EXCHANGE] = None
+        tick[Datacode.AVG_DAILY_VOL_3MOMTH] = None
 
         try:
-            r = '<meta\s*itemprop="([^"]+)"\s*content="([^"]+)"\s*/>'
+            r = '<span[^>]+role="heading"[^>]+>(.*?)</span>'
             pattern = re.compile(r)
-            result = re.findall(pattern, text)
 
-            if len(result) == 0:
-                return 'Data for \'{}\' not found'.format(ticker)
+            match = pattern.search(text)
+            if not match:
+                return None
+            start = match.span(0)[1]
 
-            if ticker not in self.realtime:
-                self.realtime[ticker] = {}
+            tick[Datacode.NAME] = self.save_wrapper(
+                lambda: html.unescape(un_span(match.group(1)).strip()))
 
-            tick = self.realtime[ticker]
+            # next div is TICKER
+            r = '<div [^>]*><div [^>]*>(.*?)</div></div>'
+            pattern = re.compile(r)
 
-            for key, value in result:
+            match = pattern.search(text, start)
+            if not match:
+                return 'Google.getRealtime({}, {}) - no match'.format(ticker, datacode)
 
-                if key == 'exchangeTimezone':
-                    try:
-                        tick[Datacode.TIMEZONE] = str(value)
-                    except:
-                        pass
+            ticker = self.save_wrapper(
+                lambda: html.unescape(match.group(1)).replace(' ', ''))
 
-                elif key == 'priceChange':
-                    try:
-                        tick[Datacode.CHANGE] = float(value)
-                    except:
-                        pass
-
-                elif key == 'quoteTime':
-                    try:
-                        dt = datetime.datetime.strptime(value, "%Y-%m-%dT%H:%M:%SZ")
-                        tick[Datacode.LAST_PRICE_DATE] = dt.date()
-                        tick[Datacode.LAST_PRICE_TIME] = dt.time()
-                    except:
-                        pass
-
-                elif key == 'priceChangePercent':
-                    try:
-                        tick[Datacode.CHANGE_IN_PERCENT] = float(value)
-                    except:
-                        pass
-
-                elif key == 'price':
-                    try:
-                        locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
-                        tick[Datacode.LAST_PRICE] = locale.atof(str(value))
-                    except:
-                        pass
-
-                elif key == 'priceCurrency':
-                    try:
-                        tick[Datacode.CURRENCY] = str(value)
-                    except:
-                        pass
-
-                elif key == 'priceCurrency':
-                    pass
-
-                elif key == 'exchange':
-                    try:
-                        tick[Datacode.EXCHANGE] = str(value)
-                    except:
-                        pass
-
-                elif key == 'name':
-                    try:
-                        tick[Datacode.NAME] = html.unescape(str(value))
-                    except:
-                        pass
-
-                elif key == 'tickerSymbol':
-                    try:
-                        tick[Datacode.TICKER] = str(value)
-                    except:
-                        pass
-
-                else:
-                    log('ignored {} {}'.format(key, value))
-
-            tick[Datacode.TIMESTAMP] = time.time()
-
-            if tick[Datacode.EXCHANGE] == 'CURRENCY' and Datacode.CURRENCY not in tick:
-                tick[Datacode.CURRENCY] = ''
-
-            log(tick)
+            tick[Datacode.EXCHANGE] = self.save_wrapper(lambda: ticker.split(':')[0])
+            tick[Datacode.TICKER] = self.save_wrapper(lambda: ticker.split(':')[1])
 
         except BaseException as e:
-            log(traceback.format_exc())
+            return 'Google.getRealtime({}, {}) - process: {}'.format(ticker, datacode, e)
+
+        try:
+            r = '<sticky-header [^>]*>(.*?)</sticky-header>'
+            pattern = re.compile(r, flags=re.DOTALL)
+            match = re.search(pattern, text)
+
+            if match:
+                text = match.group(1)
+            else:
+                return 'Data for \'{}\' not found'.format(ticker)
+
+            parser = NaiveHTMLParser()
+            root = parser.feed(text)
+            parser.close()
+
+            cards = root.findall('.//g-card-section')
+
+            if len(cards) < 4:
+                return 'Data for \'{}\' not found'.format(ticker)
+
+            header = cards[1]
+
+            tick[Datacode.LAST_PRICE] = self.save_wrapper(
+                lambda: float(
+                    html.unescape(header.find('./span[1]/span[1]/span[1]').text).replace(',', '').strip()))
+
+            tick[Datacode.CURRENCY] = self.save_wrapper(
+                lambda: html.unescape(header.find('./span[1]/span[1]/span[2]').text).strip())
+
+            tick[Datacode.CHANGE] = self.save_wrapper(
+                lambda: float(
+                    html.unescape(header.find('./span[2]/span[1]').text).replace('−', '-').replace(',', '').strip()))
+
+            # percentage is always wrapped in (...) and always positive even if there is a price drop
+            tick[Datacode.CHANGE_IN_PERCENT] = self.save_wrapper(
+                lambda: float(
+                    html.unescape(header.find('./span[2]/span[2]/span[1]').text).strip()
+                        .replace('(', '').replace(')', '').replace('%', '')))
+
+            try:
+                value = html.unescape(header.find('./div[1]/span[1]/span[2]').text).replace('·', '').strip()
+                logger.debug(value)
+                dt = dateutil.parser.parse(value, tzinfos=whois_timezone_info)
+                tick[Datacode.LAST_PRICE_DATE] = dt.date()
+                tick[Datacode.LAST_PRICE_TIME] = dt.time()
+
+                time_bits = value.split(' ')
+                if len(time_bits) >= 4:
+                    tick[Datacode.TIMEZONE] = time_bits[-1]
+
+            except BaseException as e:
+                pass
+
+            footer = cards[3]
+            logger.debug(ET.tostring(footer))
+
+            # parse 'footer' for remaining fields
+            table = footer.find('./div[1]/div[1]/div[1]/table[1]')
+
+            tick[Datacode.OPEN] = self.save_wrapper(
+                lambda: float(
+                    html.unescape(table.find('./tr[1]/td[2]').text).replace(',', '').strip()))
+
+            tick[Datacode.HIGH] = self.save_wrapper(
+                lambda: float(
+                    html.unescape(table.find('./tr[2]/td[2]').text).replace(',', '').strip()))
+
+            tick[Datacode.LOW] = self.save_wrapper(
+                lambda: float(
+                    html.unescape(table.find('./tr[3]/td[2]').text).replace(',', '').strip()))
+
+            tick[Datacode.MARKET_CAP] = self.save_wrapper(
+                lambda: handle_abbreviations(
+                    html.unescape(table.find('./tr[4]/td[2]').text).replace(',', '').replace('-', '').strip()))
+
+            table = footer.find('./div[1]/div[1]/div[2]/table[1]')
+
+            # for indices: first item on right side is LOW
+            if html.unescape(table.find('./tr[1]/td[1]').text).strip() == 'Low':
+                tick[Datacode.LOW] = self.save_wrapper(
+                    lambda: float(
+                        html.unescape(table.find('./tr[1]/td[2]').text).replace(',', '').strip()))
+
+            tick[Datacode.PREV_CLOSE] = self.save_wrapper(
+                lambda: float(
+                    html.unescape(table.find('./tr[2]/td[2]').text).replace(',', '').strip()))
+
+            tick[Datacode.HIGH_52_WEEK] = self.save_wrapper(
+                lambda: float(
+                    html.unescape(table.find('./tr[3]/td[2]').text).replace(',', '').strip()))
+
+            tick[Datacode.LOW_52_WEEK] = self.save_wrapper(
+                lambda: float(
+                    html.unescape(table.find('./tr[4]/td[2]').text).replace(',', '').strip()))
+
+            logger.info(tick)
+
+        except BaseException as e:
+            logger.warning(traceback.format_exc())
             return 'Google.getRealtime({}, {}) - process: {}'.format(ticker, datacode, e)
 
         return self._return_value(self.realtime[ticker], datacode)

src/jsonParser.py

@@ -8,20 +8,25 @@
 # Updated 8 Jan 2007 - fixed dict grouping bug, and made elements and
 #   members optional in array and object collections
 #
+# Updated 9 Aug 2016 - use more current pyparsing constructs/idioms
+#
+
+# https://github.com/pyparsing/pyparsing/blob/master/examples/jsonParser.py - revision 53d1b4a on 1 Nov 2019
+
 json_bnf = """
-object 
-    { members } 
-    {} 
-members 
-    string : value 
-    members , string : value 
-array 
+object
+    { members }
+    {}
+members
+    string : value
+    members , string : value
+array
     [ elements ]
-    [] 
-elements 
-    value 
-    elements , value 
-value 
+    []
+elements
+    value
+    elements , value
+value
     string
     number
     object
@@ -31,40 +36,38 @@ value
     null
 """
 
-from pyparsing import *
+import pyparsing as pp
+from pyparsing import pyparsing_common as ppc
 
-TRUE = Keyword("true").setParseAction(replaceWith(True))
-FALSE = Keyword("false").setParseAction(replaceWith(False))
-NULL = Keyword("null").setParseAction(replaceWith(None))
 
-jsonString = dblQuotedString.setParseAction(removeQuotes)
-jsonNumber = Combine(Optional('-') + ('0' | Word('123456789', nums)) +
-                     Optional('.' + Word(nums)) +
-                     Optional(Word('eE', exact=1) + Word(nums + '+-', nums)))
+def make_keyword(kwd_str, kwd_value):
+    return pp.Keyword(kwd_str).setParseAction(pp.replaceWith(kwd_value))
 
-jsonObject = Forward()
-jsonValue = Forward()
-jsonElements = delimitedList(jsonValue)
-jsonArray = Group(Suppress('[') + Optional(jsonElements) + Suppress(']'))
-jsonValue << (jsonString | jsonNumber | Group(jsonObject) | jsonArray | TRUE | FALSE | NULL)
-memberDef = Group(jsonString + Suppress(':') + jsonValue)
-jsonMembers = delimitedList(memberDef)
-jsonObject << Dict(Suppress('{') + Optional(jsonMembers) + Suppress('}'))
 
-jsonComment = cppStyleComment
+TRUE = make_keyword("true", True)
+FALSE = make_keyword("false", False)
+NULL = make_keyword("null", None)
+
+LBRACK, RBRACK, LBRACE, RBRACE, COLON = map(pp.Suppress, "[]{}:")
+
+jsonString = pp.dblQuotedString().setParseAction(pp.removeQuotes)
+jsonNumber = ppc.number()
+
+jsonObject = pp.Forward()
+jsonValue = pp.Forward()
+jsonElements = pp.delimitedList(jsonValue)
+jsonArray = pp.Group(LBRACK + pp.Optional(jsonElements, []) + RBRACK)
+jsonValue << (
+    jsonString | jsonNumber | pp.Group(jsonObject) | jsonArray | TRUE | FALSE | NULL
+)
+memberDef = pp.Group(jsonString + COLON + jsonValue)
+jsonMembers = pp.delimitedList(memberDef)
+jsonObject << pp.Dict(LBRACE + pp.Optional(jsonMembers) + RBRACE)
+
+jsonComment = pp.cppStyleComment
 jsonObject.ignore(jsonComment)
 
 
-def convertNumbers(s, l, toks):
-    n = toks[0]
-    try:
-        return int(n)
-    except ValueError as ve:
-        return float(n)
-
-
-jsonNumber.setParseAction(convertNumbers)
-
 if __name__ == "__main__":
     testdata = """
     {
@@ -72,7 +75,7 @@ if __name__ == "__main__":
             "title": "example glossary",
             "GlossDiv": {
                 "title": "S",
-                "GlossList": 
+                "GlossList":
                     {
                     "ID": "SGML",
                     "SortAs": "SGML",
@@ -96,20 +99,14 @@ if __name__ == "__main__":
     }
     """
 
-    import pprint
-
     results = jsonObject.parseString(testdata)
-    pprint.pprint(results.asList())
-    print
-
+    results.pprint()
+    print()
 
     def testPrint(x):
-        print
-        type(x), repr(x)
+        print(type(x), repr(x))
 
-
-    print
-    results.glossary.GlossDiv.GlossList.keys()
+    print(list(results.glossary.GlossDiv.GlossList.keys()))
     testPrint(results.glossary.title)
     testPrint(results.glossary.GlossDiv.GlossList.ID)
     testPrint(results.glossary.GlossDiv.GlossList.FalseValue)

src/naivehtmlparser.py

@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+
+# https://github.com/marmelo/python-htmlparser - revision cbe9633 on 25 Dec 2013
+# Copyright by Rafael Marmelo
+
+"""
+Python 3.x HTMLParser extension with ElementTree support.
+"""
+
+from html.parser import HTMLParser
+from xml.etree import ElementTree
+
+
+class NaiveHTMLParser(HTMLParser):
+    """
+    Python 3.x HTMLParser extension with ElementTree support.
+    @see https://github.com/marmelo/python-htmlparser
+    """
+
+    def __init__(self):
+        self.root = None
+        self.tree = []
+        HTMLParser.__init__(self)
+
+    def feed(self, data):
+        HTMLParser.feed(self, data)
+        return self.root
+
+    def handle_starttag(self, tag, attrs):
+        if len(self.tree) == 0:
+            element = ElementTree.Element(tag, dict(self.__filter_attrs(attrs)))
+            self.tree.append(element)
+            self.root = element
+        else:
+            element = ElementTree.SubElement(self.tree[-1], tag, dict(self.__filter_attrs(attrs)))
+            self.tree.append(element)
+
+    def handle_endtag(self, tag):
+        self.tree.pop()
+
+    def handle_startendtag(self, tag, attrs):
+        self.handle_starttag(tag, attrs)
+        self.handle_endtag(tag)
+        pass
+
+    def handle_data(self, data):
+        if self.tree:
+            self.tree[-1].text = data
+
+    def get_root_element(self):
+        return self.root
+
+    def __filter_attrs(self, attrs):
+        return filter(lambda x: x[0] and x[1], attrs) if attrs else []
+
+
+# example usage
+if __name__ == "__main__":
+
+    html = """
+    <html>
+      <head>
+        <title>GitHub</title>
+      </head>
+      <body>
+        <a href="https://github.com/marmelo">GitHub</a>
+        <a href="https://github.com/marmelo/python-htmlparser">GitHub Project</a>
+      </body>
+    </html>
+    """
+
+    parser = NaiveHTMLParser()
+    root = parser.feed(html)
+    parser.close()
+
+    # root is an xml.etree.Element and supports the ElementTree API
+    # (e.g. you may use its limited support for XPath expressions)
+
+    # get title
+    print(root.find('head/title').text)
+
+    # get all anchors
+    for a in root.findall('.//a'):
+        print(a.get('href'))
+
+    # for more information, see:
+    # http://docs.python.org/2/library/xml.etree.elementtree.html
+    # http://docs.python.org/2/library/xml.etree.elementtree.html#xpath-support

src/test_ft.py

@@ -0,0 +1,258 @@
+#  test_yahoo.py
+#
+#  license: GNU LGPL
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3 of the License, or (at your option) any later version.
+
+import argparse
+import logging
+import sys
+import unittest
+
+import financials
+from datacode import Datacode
+
+financials = financials.createInstance(None)
+
+logging.basicConfig(level=logging.ERROR)
+
+
+class Test(unittest.TestCase):
+
+    def test_currency(self):
+        s = financials.getRealtime('EURGBP', Datacode.LAST_PRICE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_currency LAST_PRICE')
+
+        s = financials.getRealtime('EURGBP', Datacode.CURRENCY.value, 'FT')
+        self.assertEqual(type(s), str, 'test_currency CURRENCY')
+
+    def test_US_equity(self):
+
+        s = financials.getRealtime('INTC:NSQ', Datacode.CHANGE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity CHANGE {}'.format(s))
+
+        s = financials.getRealtime('INTC:NSQ', Datacode.CHANGE_IN_PERCENT.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity CHANGE_IN_PERCENT {}'.format(s))
+
+        s = financials.getRealtime('INTC:NSQ', Datacode.AVG_DAILY_VOL_3MOMTH.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity AVG_DAILY_VOL_3MOMTH {}'.format(s))
+
+        s = financials.getRealtime('INTC:NSQ', Datacode.MARKET_CAP.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity MARKET_CAP {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.TICKER.value, 'FT')
+        self.assertEqual(type(s), str, 'test_US_equity TICKER {}'.format(s))
+        self.assertEqual(s, 'IBM:NYQ', 'test_US_equity TICKER {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.PREV_CLOSE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity PREV_CLOSE {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.OPEN.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity OPEN {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.LAST_PRICE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity LAST_PRICE {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.LOW.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity LOW {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.HIGH.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity HIGH {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.VOLUME.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_equity VOLUME {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.NAME.value, 'FT')
+        self.assertEqual(type(s), str, 'test_US_equity NAME {}'.format(s))
+        self.assertEqual(s, 'International Business Machines Corp',
+                         'test_US_equity NAME {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.SECTOR.value, 'FT')
+        self.assertEqual(type(s), str, 'test_US_equity SECTOR {}'.format(s))
+        self.assertEqual(s, 'Technology', 'test_US_equity SECTOR {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.INDUSTRY.value, 'FT')
+        self.assertEqual(type(s), str, 'test_US_equity INDUSTRY {}'.format(s))
+        self.assertEqual(s, 'Software & Computer Services', 'test_US_equity INDUSTRY {}'.format(s))
+
+        s = financials.getRealtime('IBM:NYQ', Datacode.TIMEZONE.value, 'FT')
+        self.assertEqual(type(s), str, 'test_US_equity TIMEZONE {}'.format(s))
+
+    def test_US_mutuals(self):
+
+        s = financials.getRealtime('VGSLX', Datacode.LAST_PRICE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_mutuals LAST_PRICE {}'.format(s))
+
+        s = financials.getRealtime('VGSLX', Datacode.NAME.value, 'FT')
+        self.assertEqual(s, "Vanguard Real Estate Index Fund Admiral Shares",
+                         'test_US_mutuals NAME {}'.format(s))
+
+        s = financials.getRealtime('VGSLX', Datacode.CURRENCY.value, 'FT')
+        self.assertEqual(s, "USD", 'test_US_mutuals CURRENCY {}'.format(s))
+
+        s = financials.getRealtime('VGSLX', Datacode.CHANGE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_mutuals CHANGE {}'.format(s))
+
+        s = financials.getRealtime('VGSLX', Datacode.CHANGE_IN_PERCENT.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_mutuals CHANGE_IN_PERCENT {}'.format(s))
+
+        s = financials.getRealtime('VFIAX', Datacode.LAST_PRICE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_US_mutuals LAST_PRICE {}'.format(s))
+
+        s = financials.getRealtime('VFIAX', Datacode.LAST_PRICE_DATE.value, 'FT')
+        self.assertEqual(type(s), str, 'test_US_mutuals LAST_PRICE_DATE {}'.format(s))
+
+        s = financials.getRealtime('VFIAX', Datacode.LAST_PRICE_TIME.value, 'FT')
+        self.assertEqual(type(s), str, 'test_US_mutuals LAST_PRICE_TIME {}'.format(s))
+
+    def test_UK_ETF(self):
+
+        s = financials.getRealtime('CSP1:LSE:GBX', Datacode.NAME.value, 'FT')
+        self.assertEqual(type(s), str, 'test_UK_ETF NAME {}'.format(s))
+        self.assertEqual(s, 'iShares Core S&P 500 UCITS ETF USD (Acc)',
+                         'test_UK_ETF NAME {}'.format(s))
+
+        s = financials.getRealtime('C060:GER:EUR', Datacode.NAME.value, 'FT')
+        self.assertEqual(type(s), str, 't_UK_ETF NAME {}'.format(s))
+
+        s = financials.getRealtime('VERX:LSE:GBP', Datacode.LAST_PRICE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_UK_ETF LAST_PRICE {}'.format(s))
+
+        s = financials.getRealtime('VERX:LSE:GBP', Datacode.TIMEZONE.value, 'FT')
+        self.assertEqual(type(s), str, 'test_UK_ETF TIMEZONE {}'.format(s))
+
+    def test_DE_equity(self):
+
+        s = financials.getRealtime('SAPX:GER', Datacode.NAME.value, 'FT')
+        self.assertEqual(s, "SAP SE", 'test_DE_equity NAME {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.TICKER.value, 'FT')
+        self.assertEqual(s, "SAPX:GER", 'test_DE_equity TICKER {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.CURRENCY.value, 'FT')
+        self.assertEqual(s, 'EUR', 'test_DE_equity CURRENCY {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.LAST_PRICE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity LAST_PRICE {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.CHANGE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity CHANGE {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.CHANGE_IN_PERCENT.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity CHANGE_IN_PERCENT {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.VOLUME.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity VOLUME {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.OPEN.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity OPEN {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.HIGH.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity HIGH {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.LOW.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity LOW {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.PREV_CLOSE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity PREV_CLOSE {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.MARKET_CAP.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity MARKET_CAP {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.SECTOR.value, 'FT')
+        self.assertEqual(type(s), str, 'test_DE_equity SECTOR {}'.format(s))
+        self.assertEqual(s, 'Technology', 'test_DE_equity SECTOR {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.INDUSTRY.value, 'FT')
+        self.assertEqual(type(s), str, 'test_DE_equity INDUSTRY {}'.format(s))
+        self.assertEqual(s, 'Software & Computer Services', 'test_DE_equity INDUSTRY {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.LAST_PRICE_DATE.value, 'FT')
+        self.assertEqual(type(s), str, 'test_DE_equity LAST_PRICE_DATE {}'.format(s))
+
+        s = financials.getRealtime('SAPX:GER', Datacode.TIMEZONE.value, 'FT')
+        self.assertEqual(type(s), str, 'test_DE_equity TIMEZONE {}'.format(s))
+
+    def test_TY_equity(self):
+        s = financials.getRealtime('6503:TYO', Datacode.OPEN.value, 'FT')
+        self.assertEqual(type(s), float, 'test_TY_equity OPEN {}'.format(s))
+
+        s = financials.getRealtime('6503:TYO', Datacode.LOW.value, 'FT')
+        self.assertEqual(type(s), float, 'test_TY_equity LOW {}'.format(s))
+
+        s = financials.getRealtime('6503:TYO', Datacode.HIGH.value, 'FT')
+        self.assertEqual(type(s), float, 'test_TY_equity HIGH {}'.format(s))
+
+        s = financials.getRealtime('6503:TYO', Datacode.LOW_52_WEEK.value, 'FT')
+        self.assertEqual(type(s), float, 'test_TY_equity LOW_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('6503:TYO', Datacode.HIGH_52_WEEK.value, 'FT')
+        self.assertEqual(type(s), float, 'test_TY_equity HIGH_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('6503:TYO', Datacode.MARKET_CAP.value, 'FT')
+        self.assertEqual(type(s), float, 'test_TY_equity MARKET_CAP {}'.format(s))
+
+        s = financials.getRealtime('6503:TYO', Datacode.VOLUME.value, 'FT')
+        self.assertEqual(type(s), float, 'test_TY_equity VOLUME {}'.format(s))
+
+        s = financials.getRealtime('6503:TYO', Datacode.CURRENCY.value, 'FT')
+        self.assertEqual(s, 'JPY', 'test_TY_equity CURRENCY')
+
+        s = financials.getRealtime('6503:TYO', Datacode.SECTOR.value, 'FT')
+        self.assertEqual(type(s), str, 'test_TY_equity SECTOR {}'.format(s))
+        self.assertEqual(s, 'Industrials', 'test_TY_equity SECTOR {}'.format(s))
+
+        s = financials.getRealtime('6503:TYO', Datacode.INDUSTRY.value, 'FT')
+        self.assertEqual(type(s), str, 'test_TY_equity INDUSTRY {}'.format(s))
+        self.assertEqual(s, 'General Industrials', 'test_TY_equity INDUSTRY {}'.format(s))
+
+    def test_index(self):
+
+        s = financials.getRealtime('INX:IOM', Datacode.TICKER.value, 'FT')
+        self.assertEqual(s, "INX:IOM", 'test_index TICKER {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.TICKER.value, 'FT')
+        self.assertEqual(s, "DAXX:GER", 'test_index TICKER {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.LAST_PRICE.value, 'FT')
+        self.assertEqual(type(s), float, 'test_index LAST_PRICE {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.VOLUME.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity VOLUME {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.LOW_52_WEEK.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity LOW_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.HIGH_52_WEEK.value, 'FT')
+        self.assertEqual(type(s), float, 'test_DE_equity HIGH_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.OPEN.value, 'FT')
+        self.assertIsNone(s, 'test_DE_equity OPEN {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.HIGH.value, 'FT')
+        self.assertIsNone(s, 'test_DE_equity HIGH {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.LOW.value, 'FT')
+        self.assertIsNone(s, 'test_DE_equity LOW {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.PREV_CLOSE.value, 'FT')
+        self.assertIsNone(s, 'test_DE_equity PREV_CLOSE {}'.format(s))
+
+        s = financials.getRealtime('DAXX:GER', Datacode.MARKET_CAP.value, 'FT')
+        self.assertIsNone(s, 'test_DE_equity MARKET_CAP {}'.format(s))
+
+    def test_errors(self):
+
+        s = financials.getRealtime('NO_NAME', Datacode.LAST_PRICE.value, 'FT')
+        self.assertIsNone(s, 'test_errors LAST_PRICE {}'.format(s))
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('unittest_args', nargs='*')
+    args = parser.parse_args()
+    unit_argv = [sys.argv[0]] + args.unittest_args
+    unittest.main(argv=unit_argv)

src/test_google.py

@@ -7,6 +7,9 @@
 #  License as published by the Free Software Foundation; either
 #  version 3 of the License, or (at your option) any later version.
 
+import argparse
+import logging
+import sys
 import unittest
 
 import financials
@@ -14,42 +17,44 @@ from datacode import Datacode
 
 financials = financials.createInstance(None)
 
+logging.basicConfig(level=logging.ERROR)
 
-class TestGoogle(unittest.TestCase):
+
+class Test(unittest.TestCase):
 
     def test_currency(self):
         s = financials.getRealtime('EURGBP', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_currency LAST_PRICE')
-
-        s = financials.getRealtime('EURGBP', Datacode.CURRENCY.value, 'GOOGLE')
-        self.assertEqual(type(s), str, 'test_currency CURRENCY')
-        self.assertEqual(s, '', 'test_currency CURRENCY')
+        self.assertIsNone(s, 'test_currency LAST_PRICE')
 
     def test_UK_equity(self):
-        s = financials.getRealtime('EURGBP', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_UK_equity LAST_PRICE')
-
         s = financials.getRealtime('LON:VOD', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_UK_equity LAST_PRICE')
+        self.assertEqual(type(s), float, 'test_UK_equity LAST_PRICE {}'.format(s))
 
-        s = financials.getRealtime('VOD.L', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_UK_equity LAST_PRICE')
-
-        s = financials.getRealtime('VOD.L', Datacode.TICKER.value, 'GOOGLE')
+        s = financials.getRealtime('LON:VOD', Datacode.TICKER.value, 'GOOGLE')
         self.assertEqual(s, 'VOD', 'test_UK_equity TICKER')
 
-        s = financials.getRealtime('VOD.L', Datacode.NAME.value, 'GOOGLE')
+        s = financials.getRealtime('LON:VOD', Datacode.NAME.value, 'GOOGLE')
         self.assertEqual(type(s), str, 'test_UK_equity NAME')
 
+        s = financials.getRealtime('LON:VOD', Datacode.EXCHANGE.value, 'GOOGLE')
+        self.assertEqual(s, 'LON', 'test_UK_equity EXCHANGE')
+
+        s = financials.getRealtime('LON:VOD', Datacode.PREV_CLOSE.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_UK_equity PREV_CLOSE {}'.format(s))
+
+        # MARKET_CAP missing for UK stock but available for German stock - weekend issue (FX) ?
+        s = financials.getRealtime('LON:VOD', Datacode.MARKET_CAP.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_UK_equity MARKET_CAP {}'.format(s))
+
     def test_UK_ETF(self):
         s = financials.getRealtime('LON:CSP1', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_UK_ETF LAST_PRICE')
+        self.assertEqual(type(s), float, 'test_UK_ETF LAST_PRICE {}'.format(s))
 
         s = financials.getRealtime('LON:CSP1', Datacode.CURRENCY.value, 'GOOGLE')
         self.assertEqual(s, 'GBX', 'test_UK_ETF CURRENCY')
 
         s = financials.getRealtime('LON:FTAL', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_UK_ETF LAST_PRICE')
+        self.assertEqual(type(s), float, 'test_UK_ETF LAST_PRICE {}'.format(s))
 
         s = financials.getRealtime('LON:FTAL', Datacode.CURRENCY.value, 'GOOGLE')
         self.assertEqual(s, 'GBP', 'test_UK_ETF CURRENCY')
@@ -83,30 +88,56 @@ class TestGoogle(unittest.TestCase):
         self.assertEqual(type(s), float, 'test_DE_equity \'21\'')
 
         s = financials.getRealtime('FRA:SAP', Datacode.TIMEZONE.value, 'GOOGLE')
-        self.assertEqual(s, 'Europe/Berlin', 'test_DE_equity TIMEZONE')
+        # self.assertEqual(s, 'Europe/Berlin', 'test_DE_equity TIMEZONE')
+        self.assertTrue(s == 'CET' or s == 'CEST', 'test_DE_equity TIMEZONE: {}'.format(s))
 
     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')
+        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('C060.de', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_DE_ETF LAST_PRICE')
+        s = financials.getRealtime('FRA:C060', Datacode.TICKER.value, 'GOOGLE')
+        self.assertEqual('C060', s, 'test_DE_ETF TICKER')
 
-        s = financials.getRealtime('C060.de', Datacode.TICKER.value, 'GOOGLE')
-        self.assertEqual(s, 'C060', 'test_DE_ETF CURRENCY')
+        s = financials.getRealtime('FRA:C060', Datacode.EXCHANGE.value, 'GOOGLE')
+        self.assertEqual('FRA', s, 'test_DE_ETF EXCHANGE')
 
-        s = financials.getRealtime('C060.de', Datacode.EXCHANGE.value, 'GOOGLE')
-        self.assertEqual(s, 'FRA', 'test_DE_ETF CURRENCY')
+        s = financials.getRealtime('FRA:C060', Datacode.CURRENCY.value, 'GOOGLE')
+        self.assertEqual('EUR', s, 'test_DE_ETF CURRENCY')
 
-        s = financials.getRealtime('C060.de', Datacode.CURRENCY.value, 'GOOGLE')
-        self.assertEqual(s, 'EUR', 'test_DE_ETF CURRENCY')
+        s = financials.getRealtime('FRA:C060', Datacode.MARKET_CAP.value, 'GOOGLE')
+        self.assertIsNone(s, 'test_DE_ETF MARKET_CAP {}'.format(s))
+
+    def test_TY_equity(self):
+        s = financials.getRealtime('TYO:6503', Datacode.OPEN.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_TY_equity OPEN {}'.format(s))
+
+        s = financials.getRealtime('TYO:6503', Datacode.LOW.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_TY_equity LOW {}'.format(s))
+
+        s = financials.getRealtime('TYO:6503', Datacode.HIGH.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_TY_equity HIGH {}'.format(s))
+
+        s = financials.getRealtime('TYO:6503', Datacode.LOW_52_WEEK.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_TY_equity LOW_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('TYO:6503', Datacode.HIGH_52_WEEK.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_TY_equity HIGH_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('TYO:6503', Datacode.MARKET_CAP.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_TY_equity MARKET_CAP {}'.format(s))
+
+        # s = financials.getRealtime('TYO:6503', Datacode.VOLUME.value, 'GOOGLE')
+        # self.assertEqual(type(s), float, 'test_TY_equity VOLUME {}'.format(s))
+
+        s = financials.getRealtime('TYO:6503', Datacode.CURRENCY.value, 'GOOGLE')
+        self.assertEqual(s, 'JPY', 'test_TY_equity CURRENCY')
 
     def test_US_equity(self):
         s = financials.getRealtime(' NASDAQ : AAPL ', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_US_equity LAST_PRICE')
+        self.assertEqual(type(s), float, 'test_US_equity LAST_PRICE {}'.format(s))
 
         s = financials.getRealtime(' NASDAQ : AAPL ', Datacode.TICKER.value, 'GOOGLE')
         self.assertEqual(s, 'AAPL', 'test_US_equity TICKER')
@@ -118,7 +149,7 @@ class TestGoogle(unittest.TestCase):
         self.assertEqual(s, 'USD', 'test_US_equity CURRENCY')
 
         s = financials.getRealtime('NYSE:IBM', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_US_equity LAST_PRICE')
+        self.assertEqual(type(s), float, 'test_US_equity LAST_PRICE {}'.format(s))
 
         s = financials.getRealtime('NYSE:IBM', Datacode.TICKER.value, 'GOOGLE')
         self.assertEqual(s, 'IBM', 'test_US_equity TICKER')
@@ -131,23 +162,63 @@ class TestGoogle(unittest.TestCase):
 
         s = financials.getRealtime('NYSE:IBM', Datacode.NAME.value, 'GOOGLE')
         self.assertEqual(type(s), str, 'test_US_equity NAME')
+        self.assertEqual(s, 'IBM Common Stock', 'test_US_equity NAME')
 
-        s = financials.getRealtime('NYSE:IBM', Datacode.NAME.value, 'GOOGLE')
-        self.assertEqual(type(s), str, 'test_US_equity NAME')
+        s = financials.getRealtime('NYSE:IBM', Datacode.LOW.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_US_equity LOW {}'.format(s))
+
+        s = financials.getRealtime('NYSE:IBM', Datacode.HIGH.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_US_equity HIGH {}'.format(s))
+
+        s = financials.getRealtime('NYSE:IBM', Datacode.LOW_52_WEEK.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_US_equity LOW_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('NYSE:IBM', Datacode.HIGH_52_WEEK.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_US_equity HIGH_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('NYSE:IBM', Datacode.MARKET_CAP.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_US_equity MARKET_CAP {}'.format(s))
+
+        # s = financials.getRealtime('NYSE:IBM', Datacode.VOLUME.value, 'GOOGLE')
+        # self.assertEqual(type(s), float, 'test_US_equity VOLUME {}'.format(s))
 
         s = financials.getRealtime('NYSE:IBM', Datacode.TIMESTAMP.value, 'GOOGLE')
         self.assertEqual(s, 'Data doesn\'t exist - 999', 'test_US_equity TIMESTAMP')
 
         s = financials.getRealtime('NYSE:IBM', Datacode.TIMEZONE.value, 'GOOGLE')
-        self.assertEqual(s, 'America/New_York', 'test_US_equity TIMEZONE')
+        # self.assertEqual(s, 'America/New_York', 'test_US_equity TIMEZONE')
+        self.assertEqual(s, 'GMT-4', 'test_US_equity TIMEZONE')
+        # self.assertEqual(s, 'GMT-5', 'test_US_equity TIMEZONE')
 
     def test_US_mutuals(self):
         s = financials.getRealtime('MUTF:VFIAX', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(type(s), float, 'test_US_mutuals LAST_PRICE')
+        self.assertEqual(type(s), float, 'test_US_mutuals LAST_PRICE - {}'.format(s))
 
         s = financials.getRealtime('MUTF:VFIAX', Datacode.CURRENCY.value, 'GOOGLE')
         self.assertEqual(s, 'USD', 'test_US_mutuals CURRENCY')
 
+        s = financials.getRealtime('MUTF:VFIAX', Datacode.TIMEZONE.value, 'GOOGLE')
+        self.assertIsNone(s, 'test_US_mutuals TIMEZONE')
+
+    def test_index(self):
+        s = financials.getRealtime('INDEXDB:DAX', Datacode.LAST_PRICE.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_index LAST_PRICE {}'.format(s))
+
+        s = financials.getRealtime('INDEXDB:DAX', Datacode.CHANGE_IN_PERCENT.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_index CHANGE_IN_PERCENT')
+
+        s = financials.getRealtime('INDEXDB:DAX', Datacode.CHANGE.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_index CHANGE')
+
+        s = financials.getRealtime('INDEXDB:DAX', Datacode.OPEN.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_index OPEN')
+
+        s = financials.getRealtime('INDEXDB:DAX', Datacode.LOW.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_index LOW')
+
+        s = financials.getRealtime('INDEXDB:DAX', Datacode.HIGH.value, 'GOOGLE')
+        self.assertEqual(type(s), float, 'test_index HIGH')
+
     def test_errors(self):
         s = financials.getRealtime(None, Datacode.LAST_PRICE.value, 'GOOGLE')
         self.assertEqual(s, 'Ticker is empty', 'test_errors')
@@ -156,7 +227,7 @@ class TestGoogle(unittest.TestCase):
         self.assertEqual(s, 'Datacode is empty', 'test_errors')
 
         s = financials.getRealtime('DOES_NOT_EXISTS', Datacode.LAST_PRICE.value, 'GOOGLE')
-        self.assertEqual(s, 'Data for \'DOES_NOT_EXISTS\' not found', 'test_errors')
+        self.assertIsNone(s, 'test_errors')
 
         s = financials.getRealtime('NYS:IBM', 'Foo', 'GOOGLE')
         self.assertEqual(s, 'Datacode is not a number', 'test_errors')
@@ -164,7 +235,7 @@ class TestGoogle(unittest.TestCase):
         # Historic data not supported on GOOGLE
 
         s = financials.getHistoric('NYS:IBM', Datacode.LAST_PRICE.value, '2017-01-01', 'GOOGLE')
-        self.assertEqual(s, 'getHistoric: Source \'GOOGLE\' not supported', 'test_errors')
+        self.assertEqual(s, 'Source \'GOOGLE\' not supported', 'test_errors')
 
     def test_errors_cell_range_passed(self):
         cell_range = ((1, 2), ('3', '4'), (5.0, 6.0))
@@ -206,4 +277,8 @@ class TestGoogle(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    parser = argparse.ArgumentParser()
+    parser.add_argument('unittest_args', nargs='*')
+    args = parser.parse_args()
+    unit_argv = [sys.argv[0]] + args.unittest_args
+    unittest.main(argv=unit_argv)

src/test_yahoo.py

@@ -7,8 +7,11 @@
 #  License as published by the Free Software Foundation; either
 #  version 3 of the License, or (at your option) any later version.
 
+import argparse
+import logging
 import os
 import pathlib
+import sys
 import unittest
 
 import financials
@@ -16,8 +19,18 @@ from datacode import Datacode
 
 financials = financials.createInstance(None)
 
+logging.basicConfig(level=logging.ERROR)
+
+
+class Test(unittest.TestCase):
+
+    def test_currency(self):
+        s = financials.getRealtime('EURGBP=X', Datacode.CURRENCY.value, 'YAHOO')
+        self.assertEqual(type(s), str, 'test_currency CURRENCY')
+
+        s = financials.getRealtime('EURGBP=X', Datacode.LAST_PRICE.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_currency LAST_PRICE')
 
-class TestYahoo(unittest.TestCase):
     def test_realtime_US_equity(self):
 
         s = financials.getRealtime('^GSPC', Datacode.NAME.value, 'YAHOO')
@@ -39,6 +52,15 @@ class TestYahoo(unittest.TestCase):
         s = financials.getRealtime('IBM', Datacode.HIGH.value, 'YAHOO')
         self.assertEqual(type(s), float, 'test_realtime_US_equity HIGH {}'.format(s))
 
+        s = financials.getRealtime('IBM', Datacode.HIGH_52_WEEK.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_realtime_US_equity HIGH_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('IBM', Datacode.LOW_52_WEEK.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_realtime_US_equity LOW_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('IBM', Datacode.MARKET_CAP.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_realtime_US_equity MARKET_CAP {}'.format(s))
+
         s = financials.getRealtime('IBM', Datacode.VOLUME.value, 'YAHOO')
         self.assertEqual(type(s), float, 'test_realtime_US_equity VOLUME {}'.format(s))
 
@@ -47,12 +69,25 @@ class TestYahoo(unittest.TestCase):
 
         s = financials.getRealtime('IBM', Datacode.NAME.value, 'YAHOO')
         self.assertEqual(type(s), str, 'test_realtime_US_equity NAME {}'.format(s))
+        self.assertEqual(s, 'International Business Machines Corporation',
+                         'test_realtime_US_equity NAME {}'.format(s))
+
+        s = financials.getRealtime('IBM', Datacode.SECTOR.value, 'YAHOO')
+        self.assertEqual(type(s), str, 'test_realtime_US_equity SECTOR {}'.format(s))
+        self.assertEqual(s, 'Technology', 'test_realtime_US_equity SECTOR {}'.format(s))
+
+        s = financials.getRealtime('IBM', Datacode.INDUSTRY.value, 'YAHOO')
+        self.assertEqual(type(s), str, 'test_realtime_US_equity INDUSTRY {}'.format(s))
+        self.assertEqual(s, 'Information Technology Services', 'test_realtime_US_equity INDUSTRY {}'.format(s))
 
         s = financials.getRealtime('IBM', Datacode.TIMEZONE.value, 'YAHOO')
         self.assertEqual(s, 'America/New_York', 'test_realtime_US_equity TIMEZONE {}'.format(s))
 
     def test_realtime_US_mutuals(self):
 
+        s = financials.getRealtime('VGSLX', Datacode.LAST_PRICE.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_realtime_US_mutuals LAST_PRICE {}'.format(s))
+
         s = financials.getRealtime('VFIAX', Datacode.LAST_PRICE.value, 'YAHOO')
         self.assertEqual(type(s), float, 'test_realtime_US_mutuals LAST_PRICE {}'.format(s))
 
@@ -75,6 +110,9 @@ class TestYahoo(unittest.TestCase):
         self.assertEqual(s, 'iShares VII Public Limited Company - iShares Core S&P 500 UCITS ETF',
                          'test_realtime_UK_ETF NAME {}'.format(s))
 
+        s = financials.getRealtime('C060.DE', Datacode.NAME.value, 'YAHOO')
+        self.assertEqual(type(s), str, 't_realtime_UK_ETF NAME {}'.format(s))
+
     def test_realtime_DE_equity(self):
 
         s = financials.getRealtime('SAP.DE', Datacode.LAST_PRICE.value, 'YAHOO')
@@ -83,24 +121,65 @@ class TestYahoo(unittest.TestCase):
         s = financials.getRealtime('SAP.DE', Datacode.TIMEZONE.value, 'YAHOO')
         self.assertEqual(s, 'Europe/Berlin', 'test_realtime_DE_equity TIMEZONE {}'.format(s))
 
+        s = financials.getRealtime('SAP.DE', Datacode.SECTOR.value, 'YAHOO')
+        self.assertEqual(type(s), str, 'test_realtime_DE_equity SECTOR {}'.format(s))
+        self.assertEqual(s, 'Technology', 'test_realtime_DE_equity SECTOR {}'.format(s))
+
+        s = financials.getRealtime('SAP.DE', Datacode.INDUSTRY.value, 'YAHOO')
+        self.assertEqual(type(s), str, 'test_realtime_DE_equity INDUSTRY {}'.format(s))
+        self.assertEqual(s, 'Software—Application', 'test_realtime_DE_equity INDUSTRY {}'.format(s))
+
+    def test_TY_equity(self):
+        s = financials.getRealtime('6503.T', Datacode.OPEN.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_TY_equity OPEN {}'.format(s))
+
+        s = financials.getRealtime('6503.T', Datacode.LOW.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_TY_equity LOW {}'.format(s))
+
+        s = financials.getRealtime('6503.T', Datacode.HIGH.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_TY_equity HIGH {}'.format(s))
+
+        s = financials.getRealtime('6503.T', Datacode.LOW_52_WEEK.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_TY_equity LOW_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('6503.T', Datacode.HIGH_52_WEEK.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_TY_equity HIGH_52_WEEK {}'.format(s))
+
+        s = financials.getRealtime('6503.T', Datacode.MARKET_CAP.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_TY_equity MARKET_CAP {}'.format(s))
+
+        s = financials.getRealtime('6503.T', Datacode.VOLUME.value, 'YAHOO')
+        self.assertEqual(type(s), float, 'test_TY_equity VOLUME {}'.format(s))
+
+        s = financials.getRealtime('6503.T', Datacode.CURRENCY.value, 'YAHOO')
+        self.assertEqual(s, 'JPY', 'test_TY_equity CURRENCY')
+
+        s = financials.getRealtime('6503.T', Datacode.SECTOR.value, 'YAHOO')
+        self.assertEqual(type(s), str, 'test_TY_equity SECTOR {}'.format(s))
+        self.assertEqual(s, 'Industrials', 'test_TY_equity SECTOR {}'.format(s))
+
+        s = financials.getRealtime('6503.T', Datacode.INDUSTRY.value, 'YAHOO')
+        self.assertEqual(type(s), str, 'test_TY_equity INDUSTRY {}'.format(s))
+        self.assertEqual(s, 'Electrical Equipment & Parts', 'test_TY_equity INDUSTRY {}'.format(s))
+
     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')
@@ -112,10 +191,11 @@ class TestYahoo(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, 160.947433, '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):
 
@@ -129,8 +209,8 @@ class TestYahoo(unittest.TestCase):
         financials.yahoo.historicdata = {}
 
         #  Inception Date 2014-09-30
-        s = financials.getHistoric('VERX.L', Datacode.CLOSE.value, '2014-01-06', 'YAHOO')
-        self.assertEqual(s, 'Not a trading day \'2014-01-06\'', 'test_historic_UK_ETF CLOSE {}'.format(s))
+        s = financials.getHistoric('VERX.L', Datacode.CLOSE.value, '2018-04-02', 'YAHOO') # Easter Monday
+        self.assertEqual(s, 'Not a trading day \'2018-04-02\'', 'test_historic_UK_ETF CLOSE {}'.format(s))
 
         #  Inception Date 2014-09-30
         s = financials.getHistoric('VERX.L', Datacode.CLOSE.value, '2015-01-01', 'YAHOO')
@@ -146,8 +226,8 @@ class TestYahoo(unittest.TestCase):
         self.assertEqual(s, 22.26, 'test_historic_UK_ETF CLOSE {}'.format(s))
 
         #  Inception Date 2014-09-30
-        s = financials.getHistoric('VERX.L', Datacode.CLOSE.value, '2014-01-06', 'YAHOO')
-        self.assertEqual(s, 'Not a trading day \'2014-01-06\'', 'test_historic_UK_ETF CLOSE {}'.format(s))
+        s = financials.getHistoric('VERX.L', Datacode.CLOSE.value, '2018-04-02', 'YAHOO')
+        self.assertEqual(s, 'Not a trading day \'2018-04-02\'', 'test_historic_UK_ETF CLOSE {}'.format(s))
 
         #  Inception Date 2014-09-30
         s = financials.getHistoric('VERX.L', Datacode.CLOSE.value, '2015-01-01', 'YAHOO')
@@ -171,33 +251,41 @@ class TestYahoo(unittest.TestCase):
         self.assertEqual(s, 82.889999, 'test_historic_DE_equity CLOSE {}'.format(s))
 
         s = financials.getHistoric('C060.DE', Datacode.CLOSE.value, '2017-01-03', 'YAHOO')
-        self.assertEqual(s, 72.870003, 'test_historic_DE_equity CLOSE {}'.format(s))
+        self.assertEqual(s, 68.209999, 'test_historic_DE_equity CLOSE {}'.format(s))
 
-    def test_errors(self):
+    def test_realtime_errors(self):
+
+        s = financials.getRealtime('NO_NAME', Datacode.LAST_PRICE.value, 'YAHOO')
+        self.assertIsNone(s, 'test_realtime_errors LAST_PRICE {}'.format(s))
+
+    def test_historic_errors(self):
+
+        s = financials.getHistoric('NO_NAME', Datacode.LAST_PRICE.value, '2018-01-08', 'YAHOO')
+        self.assertIsNone(s, 'test_historic_errors LAST_PRICE {}'.format(s))
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, '2030-01-01', 'YAHOO')
-        self.assertEqual(s, 'Future date \'2030-01-01\'', 'test_errors CLOSE {}'.format(s))
+        self.assertEqual(s, 'Future date \'2030-01-01\'', 'test_historic_errors CLOSE {}'.format(s))
 
         s = financials.getRealtime('IBM', 9999, 'YAHOO')
-        self.assertEqual(s, 'Datacode 9999 not supported', 'test_errors 9999')
+        self.assertEqual(s, 'Datacode 9999 not supported', 'test_historic_errors 9999')
 
         s = financials.getRealtime('IBM', Datacode.ADJ_CLOSE.value, 'YAHOO')
-        self.assertEqual(s, 'Data doesn\'t exist - 91', 'test_errors ADJ_CLOSE {}'.format(s))
+        self.assertEqual(s, 'Data doesn\'t exist - 91', 'test_historic_errors ADJ_CLOSE {}'.format(s))
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, '2030-01-01', 'YAHOO')
-        self.assertEqual(s, 'Future date \'2030-01-01\'', 'test_errors CLOSE {}'.format(s))
+        self.assertEqual(s, 'Future date \'2030-01-01\'', 'test_historic_errors CLOSE {}'.format(s))
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, '1990-01-01', 'YAHOO')
-        self.assertEqual(s, 'Date before 2000 \'1990-01-01\'', 'test_errors CLOSE {}'.format(s))
+        self.assertEqual(s, 'Date before 2000 \'1990-01-01\'', 'test_historic_errors CLOSE {}'.format(s))
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, 'abcdef', 'YAHOO')
-        self.assertEqual(s, 'Date format not supported: \'abcdef\'', 'test_errors CLOSE {}'.format(s))
+        self.assertEqual(s, 'Date format not supported: \'abcdef\'', 'test_historic_errors CLOSE {}'.format(s))
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, True, 'YAHOO')
-        self.assertEqual(s, 'Date type not supported: <class \'bool\'> \'True\'', 'test_errors CLOSE {}'.format(s))
+        self.assertEqual(s, 'Date type not supported: <class \'bool\'> \'True\'', 'test_historic_errors CLOSE {}'.format(s))
 
         s = financials.getHistoric('IBM', Datacode.CLOSE.value, -1000000, 'YAHOO')
-        self.assertEqual(s, 'Date format not supported: -1000000', 'test_errors CLOSE {}'.format(s))
+        self.assertEqual(s, 'Date format not supported: -1000000', 'test_historic_errors CLOSE {}'.format(s))
 
     def test_errors_cell_range_passed(self):
         cell_range = ((1, 2), ('3', '4'), (5.0, 6.0))
@@ -216,4 +304,8 @@ class TestYahoo(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    parser = argparse.ArgumentParser()
+    parser.add_argument('unittest_args', nargs='*')
+    args = parser.parse_args()
+    unit_argv = [sys.argv[0]] + args.unittest_args
+    unittest.main(argv=unit_argv)

src/tz.py

@@ -0,0 +1,232 @@
+
+# Copied from https://gist.github.com/h-j-13/e3a585796510b59601e34a07e99b386d
+
+whois_timezone_info = {
+        "A": 1 * 3600,
+        "ACDT": 10.5 * 3600,
+        "ACST": 9.5 * 3600,
+        "ACT": -5 * 3600,
+        "ACWST": 8.75 * 3600,
+        "ADT": 4 * 3600,
+        "AEDT": 11 * 3600,
+        "AEST": 10 * 3600,
+        "AET": 10 * 3600,
+        "AFT": 4.5 * 3600,
+        "AKDT": -8 * 3600,
+        "AKST": -9 * 3600,
+        "ALMT": 6 * 3600,
+        "AMST": -3 * 3600,
+        "AMT": -4 * 3600,
+        "ANAST": 12 * 3600,
+        "ANAT": 12 * 3600,
+        "AQTT": 5 * 3600,
+        "ART": -3 * 3600,
+        "AST": 3 * 3600,
+        "AT": -4 * 3600,
+        "AWDT": 9 * 3600,
+        "AWST": 8 * 3600,
+        "AZOST": 0 * 3600,
+        "AZOT": -1 * 3600,
+        "AZST": 5 * 3600,
+        "AZT": 4 * 3600,
+        "AoE": -12 * 3600,
+        "B": 2 * 3600,
+        "BNT": 8 * 3600,
+        "BOT": -4 * 3600,
+        "BRST": -2 * 3600,
+        "BRT": -3 * 3600,
+        "BST": 6 * 3600,
+        "BTT": 6 * 3600,
+        "C": 3 * 3600,
+        "CAST": 8 * 3600,
+        "CAT": 2 * 3600,
+        "CCT": 6.5 * 3600,
+        "CDT": -5 * 3600,
+        "CEST": 2 * 3600,
+        "CET": 1 * 3600,
+        "CHADT": 13.75 * 3600,
+        "CHAST": 12.75 * 3600,
+        "CHOST": 9 * 3600,
+        "CHOT": 8 * 3600,
+        "CHUT": 10 * 3600,
+        "CIDST": -4 * 3600,
+        "CIST": -5 * 3600,
+        "CKT": -10 * 3600,
+        "CLST": -3 * 3600,
+        "CLT": -4 * 3600,
+        "COT": -5 * 3600,
+        "CST": -6 * 3600,
+        "CT": -6 * 3600,
+        "CVT": -1 * 3600,
+        "CXT": 7 * 3600,
+        "ChST": 10 * 3600,
+        "D": 4 * 3600,
+        "DAVT": 7 * 3600,
+        "DDUT": 10 * 3600,
+        "E": 5 * 3600,
+        "EASST": -5 * 3600,
+        "EAST": -6 * 3600,
+        "EAT": 3 * 3600,
+        "ECT": -5 * 3600,
+        "EDT": -4 * 3600,
+        "EEST": 3 * 3600,
+        "EET": 2 * 3600,
+        "EGST": 0 * 3600,
+        "EGT": -1 * 3600,
+        "EST": -5 * 3600,
+        "ET": -5 * 3600,
+        "F": 6 * 3600,
+        "FET": 3 * 3600,
+        "FJST": 13 * 3600,
+        "FJT": 12 * 3600,
+        "FKST": -3 * 3600,
+        "FKT": -4 * 3600,
+        "FNT": -2 * 3600,
+        "G": 7 * 3600,
+        "GALT": -6 * 3600,
+        "GAMT": -9 * 3600,
+        "GET": 4 * 3600,
+        "GFT": -3 * 3600,
+        "GILT": 12 * 3600,
+        "GMT": 0 * 3600,
+        "GST": 4 * 3600,
+        "GYT": -4 * 3600,
+        "H": 8 * 3600,
+        "HDT": -9 * 3600,
+        "HKT": 8 * 3600,
+        "HOVST": 8 * 3600,
+        "HOVT": 7 * 3600,
+        "HST": -10 * 3600,
+        "I": 9 * 3600,
+        "ICT": 7 * 3600,
+        "IDT": 3 * 3600,
+        "IOT": 6 * 3600,
+        "IRDT": 4.5 * 3600,
+        "IRKST": 9 * 3600,
+        "IRKT": 8 * 3600,
+        "IRST": 3.5 * 3600,
+        "IST": 5.5 * 3600,
+        "JST": 9 * 3600,
+        "K": 10 * 3600,
+        "KGT": 6 * 3600,
+        "KOST": 11 * 3600,
+        "KRAST": 8 * 3600,
+        "KRAT": 7 * 3600,
+        "KST": 9 * 3600,
+        "KUYT": 4 * 3600,
+        "L": 11 * 3600,
+        "LHDT": 11 * 3600,
+        "LHST": 10.5 * 3600,
+        "LINT": 14 * 3600,
+        "M": 12 * 3600,
+        "MAGST": 12 * 3600,
+        "MAGT": 11 * 3600,
+        "MART": 9.5 * 3600,
+        "MAWT": 5 * 3600,
+        "MDT": -6 * 3600,
+        "MHT": 12 * 3600,
+        "MMT": 6.5 * 3600,
+        "MSD": 4 * 3600,
+        "MSK": 3 * 3600,
+        "MST": -7 * 3600,
+        "MT": -7 * 3600,
+        "MUT": 4 * 3600,
+        "MVT": 5 * 3600,
+        "MYT": 8 * 3600,
+        "N": -1 * 3600,
+        "NCT": 11 * 3600,
+        "NDT": 2.5 * 3600,
+        "NFT": 11 * 3600,
+        "NOVST": 7 * 3600,
+        "NOVT": 7 * 3600,
+        "NPT": 5.5 * 3600,
+        "NRT": 12 * 3600,
+        "NST": 3.5 * 3600,
+        "NUT": -11 * 3600,
+        "NZDT": 13 * 3600,
+        "NZST": 12 * 3600,
+        "O": -2 * 3600,
+        "OMSST": 7 * 3600,
+        "OMST": 6 * 3600,
+        "ORAT": 5 * 3600,
+        "P": -3 * 3600,
+        "PDT": -7 * 3600,
+        "PET": -5 * 3600,
+        "PETST": 12 * 3600,
+        "PETT": 12 * 3600,
+        "PGT": 10 * 3600,
+        "PHOT": 13 * 3600,
+        "PHT": 8 * 3600,
+        "PKT": 5 * 3600,
+        "PMDT": -2 * 3600,
+        "PMST": -3 * 3600,
+        "PONT": 11 * 3600,
+        "PST": -8 * 3600,
+        "PT": -8 * 3600,
+        "PWT": 9 * 3600,
+        "PYST": -3 * 3600,
+        "PYT": -4 * 3600,
+        "Q": -4 * 3600,
+        "QYZT": 6 * 3600,
+        "R": -5 * 3600,
+        "RET": 4 * 3600,
+        "ROTT": -3 * 3600,
+        "S": -6 * 3600,
+        "SAKT": 11 * 3600,
+        "SAMT": 4 * 3600,
+        "SAST": 2 * 3600,
+        "SBT": 11 * 3600,
+        "SCT": 4 * 3600,
+        "SGT": 8 * 3600,
+        "SRET": 11 * 3600,
+        "SRT": -3 * 3600,
+        "SST": -11 * 3600,
+        "SYOT": 3 * 3600,
+        "T": -7 * 3600,
+        "TAHT": -10 * 3600,
+        "TFT": 5 * 3600,
+        "TJT": 5 * 3600,
+        "TKT": 13 * 3600,
+        "TLT": 9 * 3600,
+        "TMT": 5 * 3600,
+        "TOST": 14 * 3600,
+        "TOT": 13 * 3600,
+        "TRT": 3 * 3600,
+        "TVT": 12 * 3600,
+        "U": -8 * 3600,
+        "ULAST": 9 * 3600,
+        "ULAT": 8 * 3600,
+        "UTC": 0 * 3600,
+        "UYST": -2 * 3600,
+        "UYT": -3 * 3600,
+        "UZT": 5 * 3600,
+        "V": -9 * 3600,
+        "VET": -4 * 3600,
+        "VLAST": 11 * 3600,
+        "VLAT": 10 * 3600,
+        "VOST": 6 * 3600,
+        "VUT": 11 * 3600,
+        "W": -10 * 3600,
+        "WAKT": 12 * 3600,
+        "WARST": -3 * 3600,
+        "WAST": 2 * 3600,
+        "WAT": 1 * 3600,
+        "WEST": 1 * 3600,
+        "WET": 0 * 3600,
+        "WFT": 12 * 3600,
+        "WGST": -2 * 3600,
+        "WGT": -3 * 3600,
+        "WIB": 7 * 3600,
+        "WIT": 9 * 3600,
+        "WITA": 8 * 3600,
+        "WST": 14 * 3600,
+        "WT": 0 * 3600,
+        "X": -11 * 3600,
+        "Y": -12 * 3600,
+        "YAKST": 10 * 3600,
+        "YAKT": 9 * 3600,
+        "YAPT": 10 * 3600,
+        "YEKST": 6 * 3600,
+        "YEKT": 5 * 3600,
+        "Z": 0 * 3600,
+}

src/version.py

@@ -0,0 +1,15 @@
+#  version.py
+#
+#  license: GNU LGPL
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3 of the License, or (at your option) any later version.
+
+# This file will not be actually used as it is regenerated with the correct build version
+# by generate_metainfo.py in the "compile" step
+
+# This is a bit of a hack but I can't find out how to access the version in description.xml once deployed
+
+version = '0.0.0'

src/yahoo.py

@@ -12,36 +12,35 @@ import csv
 import datetime
 import dateutil.parser
 import html
+import logging
 import os
-import pathlib
 import pprint
 import pytz
 import re
-import sys
 import time
 import traceback
 import urllib.parse
 
 from datacode import Datacode
-import baseclient
+from baseclient import BaseClient, HttpException
+from http import cookiejar
 import jsonParser
 
 
-def log(str):
-    # print(str, file=sys.stderr)
-    pass
+logger = logging.getLogger(__name__)
+# logger.setLevel(logging.DEBUG)
 
 
-def raw(price, key, default=0.0):
+def raw(m, key, default=0.0):
     try:
-        return price[key]['raw']
+        return m[key]['raw']
     except:
         pass
 
     return default
 
 
-class Yahoo(baseclient.BaseClient):
+class Yahoo(BaseClient):
     def __init__(self, ctx):
         super().__init__()
 
@@ -50,9 +49,6 @@ class Yahoo(baseclient.BaseClient):
         self.historicdata = {}
         self.js = jsonParser.jsonObject
 
-        self.basedir = os.path.join(str(pathlib.Path.home()), '.financials-extension')
-        os.makedirs(self.basedir, exist_ok=True)
-
     def _read_ticker_csv_file(self, ticker):
 
         fn = os.path.join(self.basedir, 'yahoo-{}.csv'.format(ticker))
@@ -87,7 +83,7 @@ class Yahoo(baseclient.BaseClient):
         """
         Retrieve realtime data for ticker from Yahoo Finance and cache it for further lookups
 
-        :param ticker: the ticker symbol e.g. VOD.L or LON:VOD
+        :param ticker: the ticker symbol e.g. VOD.L
         :param datacode: the requested datacode
         :return:
         """
@@ -105,10 +101,26 @@ class Yahoo(baseclient.BaseClient):
 
         url = 'https://finance.yahoo.com/quote/{}?p={}'.format(ticker, ticker)
 
+        cookies = [cookiejar.Cookie(version=0,
+                                    name="B",
+                                    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,
+                                    secure=True,
+                                    expires=None,
+                                    discard=False,
+                                    comment=None,
+                                    comment_url=None,
+                                    rest=None)
+                   ]
+
         try:
-            text = self.urlopen(url)
+            text = self.urlopen(url, redirect=True, data=None, headers=None, cookies=cookies)
+            with open(os.path.join(self.basedir, 'yahoo-{}.html'.format(ticker)), "w") as text_file:
+                print(f"<!-- '{url}' -->\r\n\r\n{text}", file=text_file)
         except BaseException as e:
-            log(traceback.format_exc())
+            logger.error(traceback.format_exc())
             return 'Yahoo.getRealtime({}, {}) - urlopen: {}'.format(ticker, datacode, e)
 
         try:
@@ -117,37 +129,39 @@ class Yahoo(baseclient.BaseClient):
 
             r = '"CrumbStore":{"crumb":"([^"]{11})"'
             pattern = re.compile(r)
-            match = re.search(pattern, text)
+            match = pattern.search(text)
 
             if match:
                 self.crumb = match.group(1)
-            else:
-                with open(os.path.join(self.basedir, 'yahoo-{}.html'.format(ticker)), "w") as text_file:
-                    print(text, file=text_file)
 
         except BaseException as e:
-            log(traceback.format_exc())
+            logger.error(traceback.format_exc())
             return 'Yahoo.getRealtime({}, {}) - crumb: {}'.format(ticker, datacode, e)
 
         try:
             start = text.find('"QuoteSummaryStore":{')
 
             if start < 0:
-                with open(os.path.join(self.basedir, 'yahoo-{}.html'.format(ticker)), "w") as text_file:
-                    print(text, file=text_file)
-
-                return 'Could not find QuoteSummaryStore for \'{}\''.format(ticker)
+                return None
 
             start = start + len('"QuoteSummaryStore":')
             results = self.js.parseString(text[start:])
 
             if not results:
-                with open(os.path.join(self.basedir, 'yahoo-{}.html'.format(ticker)), "w") as text_file:
-                    print(text, file=text_file)
                 return None
 
+        except BaseException as e:
+            logger.error(traceback.format_exc())
+            return 'Yahoo.getRealtime({}, {}) - parsing: {}'.format(ticker, datacode, e)
+
+        with open(os.path.join(self.basedir, 'yahoo-{}.js'.format(ticker)), "w") as text_file:
+            print(f"// '{url}' QuoteSummaryStore:\n", file=text_file)
+            pprint.pprint(results.asList(), stream=text_file)
+
+        try:
             price = results['price']
             quoteType = results['quoteType']
+            summaryDetail = results['summaryDetail']
 
             if not price:
                 return 'Could not find price for \'{}\''.format(ticker)
@@ -157,6 +171,8 @@ class Yahoo(baseclient.BaseClient):
 
             tick = self.realtime[ticker]
 
+            tick[Datacode.TIMESTAMP] = time.time()
+
             tick[Datacode.PREV_CLOSE] = float(raw(price, 'regularMarketPreviousClose'))
             tick[Datacode.OPEN] = float(raw(price, 'regularMarketOpen'))
             tick[Datacode.CHANGE] = float(raw(price, 'regularMarketChange'))
@@ -167,6 +183,10 @@ class Yahoo(baseclient.BaseClient):
             tick[Datacode.VOLUME] = float(raw(price, 'regularMarketVolume'))
             tick[Datacode.AVG_DAILY_VOL_3MOMTH] = float(raw(price, 'averageDailyVolume3Month'))
 
+            tick[Datacode.LOW_52_WEEK] = float(raw(summaryDetail, 'fiftyTwoWeekLow'))
+            tick[Datacode.HIGH_52_WEEK] = float(raw(summaryDetail, 'fiftyTwoWeekHigh'))
+            tick[Datacode.MARKET_CAP] = float(raw(summaryDetail, 'marketCap'))
+
             if quoteType:
                 t = int(price['regularMarketTime'])
                 tz = pytz.timezone(quoteType['exchangeTimezoneName'])
@@ -185,17 +205,19 @@ class Yahoo(baseclient.BaseClient):
             if name:
                 tick[Datacode.NAME] = html.unescape(str(name))
             else:
-                tick[Datacode.NAME] = ''
-
-            tick[Datacode.TIMESTAMP] = time.time()
+                tick[Datacode.NAME] = tick[Datacode.TICKER]
 
         except BaseException as e:
-            with open(os.path.join(self.basedir, 'yahoo-{}.js'.format(ticker)), "w") as text_file:
-                pprint.pprint(results.asList(), stream=text_file)
-
-            log(traceback.format_exc())
+            logger.error(traceback.format_exc())
             return 'Yahoo.getRealtime({}, {}) - process: {}'.format(ticker, datacode, e)
 
+        try:
+            summaryProfile = results['summaryProfile']
+            tick[Datacode.SECTOR] = str(summaryProfile['sector'])
+            tick[Datacode.INDUSTRY] = str(summaryProfile['industry'])
+        except KeyError as e:
+            pass
+
         return self._return_value(self.realtime[ticker], datacode)
 
     def getHistoric(self, ticker: str, datacode: int, date):
@@ -203,7 +225,7 @@ class Yahoo(baseclient.BaseClient):
         """
         Retrieve historic data for ticker from Yahoo Finance and cache it for further lookups
 
-        :param ticker: the ticker symbol e.g. VOD.L or LON:VOD
+        :param ticker: the ticker symbol e.g. VOD.L
         :param datacode: the requested datacode
         :param date: the requested date
         :return:
@@ -213,7 +235,10 @@ class Yahoo(baseclient.BaseClient):
         ticker = "".join(ticker.split())
         min_tick_date = None
 
-        if ticker not in self.historicdata:
+        # dividend and splits will change past adjusted prices
+        # the moment we are asked for ADJ_CLOSE we ignore the ticker cache to refresh
+
+        if Datacode.ADJ_CLOSE != datacode and ticker not in self.historicdata:
             self._read_ticker_csv_file(ticker)
 
         if ticker in self.historicdata:
@@ -222,7 +247,7 @@ class Yahoo(baseclient.BaseClient):
             if date in ticks:
                 return self._return_value(ticks[date], datacode)
 
-            # weekend, trading holiday or as yet unfetched
+            # weekend, trading holiday or as yet un-fetched
             if min(ticks) <= date <= max(ticks):
                 return 'Not a trading day \'{}\''.format(date)
 
@@ -257,7 +282,7 @@ class Yahoo(baseclient.BaseClient):
             t1 = t1 - 2682000  # pad with extra month
 
         except BaseException as e:
-            log(traceback.format_exc())
+            logger.error(traceback.format_exc())
             return 'Yahoo.getHistoric({}, {}, {}) - date: {}'.format(ticker, datacode, date, e)
 
         try:
@@ -273,8 +298,12 @@ class Yahoo(baseclient.BaseClient):
 
             self._read_ticker_csv_file(ticker)
 
+        except HttpException:
+            logger.error(traceback.format_exc())
+            return None
+
         except BaseException as e:
-            log(traceback.format_exc())
+            logger.error(traceback.format_exc())
             return 'Yahoo.getHistoric({}, {}, {}) - read: {}'.format(ticker, datacode, date, e)
 
         try:
@@ -292,7 +321,7 @@ class Yahoo(baseclient.BaseClient):
                 return 'Not a trading day \'{}\''.format(date)
 
         except BaseException as e:
-            log(traceback.format_exc())
+            logger.error(traceback.format_exc())
             return 'Yahoo.getHistoric({}, {}, {}) - process: {}'.format(ticker, datacode, date, e)
 
         return None