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

[codesite...@google.com]

Author: troy.melhase
Date: Sat Aug 30 16:20:14 2008
New Revision: 329

Modified:
trunk/Makefile
trunk/ib/ext/Contract.py
trunk/ib/ext/cfg/Contract.py

Log:
Fixed incorrect comparisons in reqMktData by setting undercomp/comboleg
attributes of contract instances to None. Bumped version in Makefile.

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Aug 30 16:20:14 2008
@@ -9,7 +9,7 @@
##

-ibpy_ver := 0.7.6a
+ibpy_ver := 0.7.6
ibpy_rev := $(shell svnversion|cut -f 2 -d \:|cut -f 1 -d M)
twsapi_ver := $(shell cat ib/ext/src/IBJts/API_VersionNum.txt |cut -f 2
-d \=)
release_num := $(ibpy_ver)-$(twsapi_ver)

Modified: trunk/ib/ext/Contract.py
==============================================================================
--- trunk/ib/ext/Contract.py (original)
+++ trunk/ib/ext/Contract.py Sat Aug 30 16:20:14 2008
@@ -15,7 +15,6 @@

from ib.lib.overloading import overloaded
from ib.lib import Cloneable
-from ib.ext.UnderComp import UnderComp
from ib.ext.Util import Util

class Contract(Cloneable):
@@ -35,8 +34,8 @@
m_primaryExch = ""
m_includeExpired = bool()
m_comboLegsDescrip = ""
- m_comboLegs = []
- m_underComp = UnderComp()
+ m_comboLegs = None
+ m_underComp = None

@overloaded
def __init__(self):

Modified: trunk/ib/ext/cfg/Contract.py
==============================================================================
--- trunk/ib/ext/cfg/Contract.py (original)
+++ trunk/ib/ext/cfg/Contract.py Sat Aug 30 16:20:14 2008
@@ -6,7 +6,6 @@
modulePreamble = [
'from ib.lib.overloading import overloaded',
'from ib.lib import Cloneable',
- 'from ib.ext.UnderComp import UnderComp',
'from ib.ext.Util import Util',
]

@@ -14,4 +13,6 @@
outputSubs = [
(r'super\.clone\(\)', r'Cloneable.clone(self)'),
(r'retval\.m_comboLegs\.clone\(\)', r'self.m_comboLegs[:]'),
+ (r' m_comboLegs = \[\]', r' m_comboLegs = None'),
+ (r' m_underComp = UnderComp\(\)', r' m_underComp = None'),
]