修正bug

PKUJohnson · Oct 10, 2019 · 66dacd3 · 66dacd3
1 parent 2ea5201
commit 66dacd3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/opendatatools/__init__.py b/opendatatools/__init__.py
@@ -9,6 +9,6 @@
 
 import os
 
-__version__ = '0.9.4'
+__version__ = '0.9.5'
 SOURCE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
diff --git a/opendatatools/economy/nbs_agent.py b/opendatatools/economy/nbs_agent.py
@@ -633,13 +633,13 @@ def get_fiscal_expend(self):
  return self._get_qg_indicator('A01', 'A1A02', dbcode = 'hgyd')
 
  def get_manufacturing_pmi(self):
- return self._get_qg_indicator('A01', 'A1901', dbcode = 'hgyd')
+ return self._get_qg_indicator('A01', 'A0B01', dbcode = 'hgyd')
 
  def get_non_manufacturing_pmi(self):
- return self._get_qg_indicator('A01', 'A1902', dbcode = 'hgyd')
+ return self._get_qg_indicator('A01', 'A0B02', dbcode = 'hgyd')
 
  def get_pmi(self):
- return self._get_qg_indicator('A01', 'A1903', dbcode = 'hgyd')
+ return self._get_qg_indicator('A01', 'A0B03', dbcode = 'hgyd')
 
  def get_import_export(self):
  return self._get_qg_indicator('A01', 'A1601', dbcode = 'hgyd')

diff --git a/opendatatools/hedgefund/hedgefund_interface.py b/opendatatools/hedgefund/hedgefund_interface.py
@@ -19,8 +19,8 @@ def load_data():
 def get_fund_list():
  return simu_agent.get_fund_list()
 
-def get_fund_nav(fund_id):
- return simu_agent.get_fund_nav(fund_id)
+def get_fund_nav(fund_id, time_span = 0):
+ return simu_agent.get_fund_nav(fund_id, time_span)
 
 def get_barclay_data(index):
  return barclay_agent.get_data(index)

diff --git a/opendatatools/hedgefund/simu_agent.py b/opendatatools/hedgefund/simu_agent.py
@@ -4,6 +4,7 @@
 import pandas as pd
 import io
 import hashlib
+import time
 
 index_map = {
  'Barclay_Hedge_Fund_Index' : 'ghsndx',
@@ -218,15 +219,15 @@ def _get_decrypt_info(self, fund_id):
  else:
  decrypt_func = self._bit_encrypt2
 
- if response.index("return xOrEncrypt(str, ")> 0:
+ if response.find("return xOrEncrypt(str, ")> 0:
  tag = "return xOrEncrypt(str, "
  else:
  tag = "return bitEncrypt(str, "
  pos = response.index(tag) + len(tag) + 1
  key = response[pos:pos+32]
  return decrypt_func, key
 
- def get_fund_nav(self, fund_id):
+ def get_fund_nav(self, fund_id, time_elapse = 0):
 
  if self.user_info is None:
  return None, '请先登录'
@@ -255,6 +256,8 @@ def get_fund_nav(self, fund_id):
  df_list.append(df)
  break
  page_no = page_no + 1
+ if time_elapse > 0:
+ time.sleep(time_elapse)
 
  df_nav = pd.concat(df_list)
  df_nav.drop('c', axis=1, inplace=True)