v0.3.5

CEDA/__init__.py

@@ -1,7 +1,7 @@
 import sys
 import os
 
-__version__ = "0.3.2"
+__version__ = "0.3.5"
 __author__ = "Terence Lau"
 
 

CEDA/economic/EPU.py

@@ -77,6 +77,10 @@ class EPUData(object):
             urls_cite = [url["EPU"] + i for i in urls_cite]
             output_data = []
             for i in range(0, len(urls_data)):
-                output_data.append(pd.read_excel(urls_data[i]))
+                try:
+                    tmp_data = pd.read_excel(urls_data[i])
+                    output_data.append(tmp_data)
+                except Exception as e:
+                    pass
             
             return {"data":output_data, "reference":urls_cite}

CEDA/economic/XinHua.py

@@ -50,6 +50,35 @@ class XHData(object):
                         title = json.loads(data["data"]["list"][0]["modelCode"])["title"]["text"]
                         titles.append(title)
                         titles_en.append(translate(text=title))
+        elif self.country == "UK":
+            for i in tqdm(range(6539, 6566)):
+                url = "https://api.cnfin.com/roll/charts/getContent?ids={}".format(i)
+                r = requests.get(url)
+                if r.ok:
+                    data = r.json()
+                    if data["data"] == "图表数据不存在":
+                        pass
+                    else:
+                        urls.append(url)
+                        tid.append(i)
+                        title = json.loads(data["data"]["list"][0]["modelCode"])["title"]["text"]
+                        titles.append(title)
+                        titles_en.append(translate(text=title))
+
+        elif self.country == "Japan":
+            for i in tqdm(range(6394, 6425)):
+                url = "https://api.cnfin.com/roll/charts/getContent?ids={}".format(i)
+                r = requests.get(url)
+                if r.ok:
+                    data = r.json()
+                    if data["data"] == "图表数据不存在":
+                        pass
+                    else:
+                        urls.append(url)
+                        tid.append(i)
+                        title = json.loads(data["data"]["list"][0]["modelCode"])["title"]["text"]
+                        titles.append(title)
+                        titles_en.append(translate(text=title))
 
         return pd.DataFrame({"urls":urls, "id":tid, "title_zh":titles, "title_en":titles_en})
     

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import os
 setup(
     name = "CEDApy",
-    version = "0.3.2",
+    version = "0.3.5",
     keywords = "quantitative economic data",
     long_description = open(
     os.path.join(