[ibpy commit] r336 - in trunk/ib/ext: . cfg

[codesite...@google.com]

Author: troy.melhase
Date: Mon Jan 26 16:00:45 2009
New Revision: 336

Modified:
trunk/ib/ext/EClientSocket.py
trunk/ib/ext/EReader.py
trunk/ib/ext/EWrapperMsgGenerator.py
trunk/ib/ext/Util.py
trunk/ib/ext/cfg/EClientSocket.py
trunk/ib/ext/cfg/EReader.py
trunk/ib/ext/cfg/EWrapperMsgGenerator.py
trunk/ib/ext/cfg/Util.py

Log:
More changes for API 9.60. Thanks to Russ Thompson.

Modified: trunk/ib/ext/EClientSocket.py
==============================================================================
--- trunk/ib/ext/EClientSocket.py (original)
+++ trunk/ib/ext/EClientSocket.py Mon Jan 26 16:00:45 2009
@@ -19,6 +19,7 @@
from ib.ext.ComboLeg import ComboLeg
from ib.ext.EClientErrors import EClientErrors
from ib.ext.EReader import EReader
+from ib.ext.Util import Util

from ib.lib.overloading import overloaded
from ib.lib import synchronized, Socket, DataInputStream, DataOutputStream

Modified: trunk/ib/ext/EReader.py
==============================================================================
--- trunk/ib/ext/EReader.py (original)
+++ trunk/ib/ext/EReader.py Mon Jan 26 16:00:45 2009
@@ -23,6 +23,8 @@
from ib.ext.OrderState import OrderState
from ib.ext.TickType import TickType
from ib.ext.UnderComp import UnderComp
+from ib.ext.Util import Util
+
from ib.lib.logger import logger

# micro optimizations

Modified: trunk/ib/ext/EWrapperMsgGenerator.py
==============================================================================
--- trunk/ib/ext/EWrapperMsgGenerator.py (original)
+++ trunk/ib/ext/EWrapperMsgGenerator.py Mon Jan 26 16:00:45 2009
@@ -14,6 +14,7 @@
# WARNING: all changes to this file will be lost.

from ib.ext.AnyWrapperMsgGenerator import AnyWrapperMsgGenerator
+from ib.ext.Util import Util

class EWrapperMsgGenerator(AnyWrapperMsgGenerator):
""" generated source for EWrapperMsgGenerator

Modified: trunk/ib/ext/Util.py
==============================================================================
--- trunk/ib/ext/Util.py (original)
+++ trunk/ib/ext/Util.py Mon Jan 26 16:00:45 2009
@@ -22,7 +22,7 @@

@classmethod
def StringIsEmpty(cls, strval):
- return strval is None or len((strval) == 0)
+ return strval is None or (len(strval) == 0)

@classmethod
def NormalizeString(cls, strval):

Modified: trunk/ib/ext/cfg/EClientSocket.py
==============================================================================
--- trunk/ib/ext/cfg/EClientSocket.py (original)
+++ trunk/ib/ext/cfg/EClientSocket.py Mon Jan 26 16:00:45 2009
@@ -10,6 +10,7 @@
'from ib.ext.ComboLeg import ComboLeg',
'from ib.ext.EClientErrors import EClientErrors',
'from ib.ext.EReader import EReader',
+ 'from ib.ext.Util import Util',
'',
'from ib.lib.overloading import overloaded',
'from ib.lib import synchronized, Socket, DataInputStream,
DataOutputStream',

Modified: trunk/ib/ext/cfg/EReader.py
==============================================================================
--- trunk/ib/ext/cfg/EReader.py (original)
+++ trunk/ib/ext/cfg/EReader.py Mon Jan 26 16:00:45 2009
@@ -14,6 +14,8 @@
'from ib.ext.OrderState import OrderState',
'from ib.ext.TickType import TickType',
'from ib.ext.UnderComp import UnderComp',
+ 'from ib.ext.Util import Util',
+ '',
'from ib.lib.logger import logger',
'',
'# micro optimizations',

Modified: trunk/ib/ext/cfg/EWrapperMsgGenerator.py
==============================================================================
--- trunk/ib/ext/cfg/EWrapperMsgGenerator.py (original)
+++ trunk/ib/ext/cfg/EWrapperMsgGenerator.py Mon Jan 26 16:00:45 2009
@@ -5,4 +5,5 @@
"""
modulePreamble = [
'from ib.ext.AnyWrapperMsgGenerator import AnyWrapperMsgGenerator',
+ 'from ib.ext.Util import Util',
]

Modified: trunk/ib/ext/cfg/Util.py
==============================================================================
--- trunk/ib/ext/cfg/Util.py (original)
+++ trunk/ib/ext/cfg/Util.py Mon Jan 26 16:00:45 2009
@@ -16,5 +16,8 @@
r'cmp(str(lhs).lower(), str(rhs).lower())'),

(r'else "" \+ value',
- r'else str(value)')
+ r'else str(value)'),
+
+ (r'len\(\(strval\) == 0\)', r'(len(strval) == 0)'),
+
]