Merge branch 'master' of https://github.com/vnpy/vnpy

wanglixiong · Mar 28, 2016 · ab6ee9b · ab6ee9b
2 parents ecbc5b7 + 4ed50c1
commit ab6ee9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/vn.oanda/test.py b/vn.oanda/test.py
@@ -19,7 +19,7 @@
     #api.getPrices({'instruments': 'EUR_USD'})
 
     # 获取历史数据，失败
-    #api.getPriceHisory({'instruments': 'EUR_USD',
+    #api.getPriceHisory({'instrument': 'EUR_USD',
                         #'granularity': 'D',
                         #'candleFormat': 'midpoint',
                         #'count': '50'})
@@ -102,4 +102,4 @@
     #api.getAutochartist({'instrument': 'EUR_USD'})
 
     # 阻塞
-    input()    
+    input()    
diff --git a/vn.oanda/vnoanda.py b/vn.oanda/vnoanda.py
@@ -87,7 +87,7 @@ def init(self, settingName, token, accountId):
         self.initFunctionSetting(FUNCTIONCODE_GETPRICES, {'path': '/v1/prices',
                                                           'method': 'GET'})        
 
-        self.initFunctionSetting(FUNCTIONCODE_GETPRICEHISTORY, {'path': 'v1/candles',
+        self.initFunctionSetting(FUNCTIONCODE_GETPRICEHISTORY, {'path': '/v1/candles',
                                                                 'method': 'GET'})
 
         self.initFunctionSetting(FUNCTIONCODE_GETACCOUNTS, {'path': '/v1/accounts',
@@ -606,4 +606,4 @@ def processStreamEvents(self):
                 if not self.active:
                     break
         else:
-            self.onError(error, -1)
+            self.onError(error, -1)