Merge pull request #1312 from vnpy/dev

v1.9.2 release dev->beta

examples/TurtleStrategy/turtleEngine.py

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+from __future__ import print_function
+
 from csv import DictReader
 from datetime import datetime
 from collections import OrderedDict, defaultdict
@@ -306,7 +308,7 @@ class BacktestingEngine(object):
     #----------------------------------------------------------------------
     def output(self, content):
         """输出信息"""
-        print content
+        print(content)
     
     #----------------------------------------------------------------------
     def getTradeData(self, vtSymbol=''):
@@ -432,4 +434,4 @@ class DailyResult(object):
 def formatNumber(n):
     """格式化数字到字符串"""
     rn = round(n, 2)        # 保留两位小数
-    return format(rn, ',')  # 加上千分符
+    return format(rn, ',')  # 加上千分符

vnpy/api/websocket/WebsocketClient.py

@@ -263,11 +263,11 @@ class WebsocketClient(object):
         """
         用于Debug： 记录最后一次发送出去的text
         """
-        self._lastSentText = text[:500]
+        self._lastSentText = text[:1000]
 
     #----------------------------------------------------------------------
     def _recordLastReceivedText(self, text):
         """
         用于Debug： 记录最后一次发送出去的text
         """
-        self._lastReceivedText = text[:500]
+        self._lastReceivedText = text[:1000]