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

[codesite...@google.com]

Author: troy.melhase
Date: Fri Dec 19 12:44:57 2008
New Revision: 332

Modified:
trunk/ib/ext/ComboLeg.py
trunk/ib/ext/EReader.py
trunk/ib/ext/OrderState.py
trunk/ib/ext/cfg/ComboLeg.py
trunk/ib/ext/cfg/EReader.py
trunk/ib/ext/cfg/OrderState.py

Log:
Return of nice disconnect exception handling. Removed useless super
__init__ calls.

Modified: trunk/ib/ext/ComboLeg.py
==============================================================================
--- trunk/ib/ext/ComboLeg.py (original)
+++ trunk/ib/ext/ComboLeg.py Fri Dec 19 12:44:57 2008
@@ -34,7 +34,7 @@

@overloaded
def __init__(self):
- super(ComboLeg, self).__init__(0, 0, None, None, 0, 0, None)
+ pass # super(ComboLeg, self).__init__(0, 0, None, None, 0, 0, None)

@__init__.register(object, int, int, str, str, int)
def __init___0(self, p_conId,
@@ -42,7 +42,7 @@
p_action,
p_exchange,
p_openClose):
- super(ComboLeg, self).__init__(p_conId, p_ratio, p_action,
p_exchange, p_openClose, 0, None)
+ pass # super(ComboLeg, self).__init__(p_conId, p_ratio, p_action,
p_exchange, p_openClose, 0, None)

@__init__.register(object, int, int, str, str, int, int, str)
def __init___1(self, p_conId,

Modified: trunk/ib/ext/EReader.py
==============================================================================
--- trunk/ib/ext/EReader.py (original)
+++ trunk/ib/ext/EReader.py Fri Dec 19 12:44:57 2008
@@ -85,6 +85,8 @@
while not self.isInterrupted() and
self.processMsg(self.readInt()):
pass
except (Exception, ), ex:
+ errmsg = ("Exception while processing message. ")
+ logger().exception(errmsg)
if self.parent().isConnected():
self.eWrapper().error(ex)
if self.parent().isConnected():

Modified: trunk/ib/ext/OrderState.py
==============================================================================
--- trunk/ib/ext/OrderState.py (original)
+++ trunk/ib/ext/OrderState.py Fri Dec 19 12:44:57 2008
@@ -32,7 +32,7 @@

@overloaded
def __init__(self):
- super(OrderState, self).__init__(None, None, None, None, 0.0, 0.0,
0.0, None, None)
+ pass # super(OrderState, self).__init__(None, None, None, None,
0.0, 0.0, 0.0, None, None)

@__init__.register(object, str, str, str, str, float, float, float,
str, str)
def __init___0(self, status,

Modified: trunk/ib/ext/cfg/ComboLeg.py
==============================================================================
--- trunk/ib/ext/cfg/ComboLeg.py (original)
+++ trunk/ib/ext/cfg/ComboLeg.py Fri Dec 19 12:44:57 2008
@@ -7,3 +7,8 @@
'from ib.lib.overloading import overloaded',
'from ib.ext.Util import Util',
]
+
+
+outputSubs = [
+ (r'(\s+)(super\(ComboLeg, self\).*)', r'\1pass # \2'),
+ ]

Modified: trunk/ib/ext/cfg/EReader.py
==============================================================================
--- trunk/ib/ext/cfg/EReader.py (original)
+++ trunk/ib/ext/cfg/EReader.py Fri Dec 19 12:44:57 2008
@@ -40,8 +40,12 @@

(r'len\(\(strval\) == 0\)', r'(len(strval) == 0)'),

- (r'(\s+)(self.parent\(\)\.wrapper\(\)\.error\(ex\))',
- r'\1errmsg = ("Exception while processing
message.")\1logger().exception(errmsg)\1\2'),
+
+ (r'(\s+)(if
self\.parent\(\)\.isConnected\(\)\:\s+self\.eWrapper\(\)\.error\(ex\))',
+ r'\1errmsg = ("Exception while processing
message. ")\1logger().exception(errmsg)\1\2',),
+
+# (r'(\s+)(self.parent\(\)\.wrapper\(\)\.error\(ex\))',
+# r'\1errmsg = ("Exception while processing
message.")\1logger().exception(errmsg)\1\2'),

]

Modified: trunk/ib/ext/cfg/OrderState.py
==============================================================================
--- trunk/ib/ext/cfg/OrderState.py (original)
+++ trunk/ib/ext/cfg/OrderState.py Fri Dec 19 12:44:57 2008
@@ -7,3 +7,7 @@
'from ib.lib.overloading import overloaded',
'from ib.ext.Util import Util',
]
+
+outputSubs = [
+ (r'(\s+)(super\(OrderState, self\).*)', r'\1pass # \2'),
+ ]