[ibpy] r347 committed - Updates for Python 2.7 and TWS 9.62.

34 views

Skip to first unread message

ib...@googlecode.com

unread,

Jan 28, 2012, 2:02:33 PM1/28/12

to ibpy-...@googlegroups.com

Revision: 347
Author: troy.m...@gmail.com
Date: Sat Jan 28 11:01:43 2012
Log: Updates for Python 2.7 and TWS 9.62.
http://code.google.com/p/ibpy/source/detail?r=347

Modified:
/trunk/Makefile
/trunk/demo/api_coverage
/trunk/demo/example_opt
/trunk/demo/option_order_data
/trunk/ib/ext/EReader.py
/trunk/ib/ext/Makefile
/trunk/ib/ext/cfg/EReader.py
/trunk/ib/opt/dispatcher.py
/trunk/ib/opt/sender.py

=======================================
--- /trunk/Makefile Fri Dec 19 15:02:03 2008
+++ /trunk/Makefile Sat Jan 28 11:01:43 2012
@@ -9,7 +9,7 @@
##

-ibpy_ver := 0.7.7
+ibpy_ver := 0.8.0
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)
@@ -42,18 +42,18 @@
echo [I] exporting source from $(svn_root) into $(release_dir)
svn export $(svn_root) $(release_dir) > /dev/null
echo [I] fixing version strings
- cd $(release_dir)/ib && sed -i s/api\ \=\ \"0\"/api\ \=\
\"$(twsapi_ver)\"/ __init__.py
- cd $(release_dir)/ib && sed -i s/version\ \=\ \"0\"/version\ \=\
\"$(release_num)\"/ __init__.py
- cd $(release_dir)/ib && sed -i s/revision\ \=\ \"r0\"/revision\ \=\
\"r$(ibpy_rev)\"/ __init__.py
+ cd $(release_dir)/ib && sed -i "" s/api\ \=\ \"0\"/api\ \=\
\"$(twsapi_ver)\"/ __init__.py
+ cd $(release_dir)/ib && sed -i "" s/version\ \=\ \"0\"/version\ \=\
\"$(release_num)\"/ __init__.py
+ cd $(release_dir)/ib && sed -i "" s/revision\ \=\ \"r0\"/revision\ \=\
\"r$(ibpy_rev)\"/ __init__.py
cd $(release_dir) && mv setup.py.in setup.py
- cd $(release_dir)/ && sed -i s/version\ \=\ \"0\"/version\ \=\
\"$(release_num)\"/ setup.py
- cd $(release_dir)/ && sed -i s/\:release_file\:/$(release_file)/ setup.py
+ cd $(release_dir)/ && sed -i "" s/version\ \=\ \"0\"/version\ \=\
\"$(release_num)\"/ setup.py
+ cd $(release_dir)/ && sed -i "" s/\:release_file\:/$(release_file)/
setup.py
cd $(release_dir) && mv README.in README
- cd $(release_dir)/ && sed -i s/\:release_num\:/$(release_num)/ README
- cd $(release_dir)/ && sed -i s/\:release_date\:/"$(release_date)"/ README
- cd $(release_dir)/ && sed -i s/\:twsapi_ver\:/$(twsapi_ver)/ README
- cd $(release_dir)/ && sed -i s/\:release_file\:/$(release_file)/ README
- cd $(release_dir)/ && sed -i s/\:release_root\:/$(release_root)/ README
+ cd $(release_dir)/ && sed -i "" s/\:release_num\:/$(release_num)/ README
+ cd $(release_dir)/ && sed -i "" s/\:release_date\:/"$(release_date)"/
README
+ cd $(release_dir)/ && sed -i "" s/\:twsapi_ver\:/$(twsapi_ver)/ README
+ cd $(release_dir)/ && sed -i "" s/\:release_file\:/$(release_file)/ README
+ cd $(release_dir)/ && sed -i "" s/\:release_root\:/$(release_root)/ README
echo [I] building source distribution
cd $(release_dir) && python setup.py sdist --formats=gztar,zip > /dev/null
echo [I] source distribution files:
=======================================
--- /trunk/demo/api_coverage Mon Jan 26 11:44:03 2009
+++ /trunk/demo/api_coverage Sat Jan 28 11:01:43 2012
@@ -45,7 +45,7 @@
2 : INFO,
1 : WARN,
0 : ERROR,
-}
+ }

def format_error(msg):
@@ -60,7 +60,7 @@
msg_formatters = {
'default':format_default,
'Error':format_error,
-}
+ }

def next_order_id():
@@ -387,6 +387,7 @@
print '\n%s (%s):' % (msg_typename, 0, )
else:
print '\nMessage type %s not recognized' % (msg_typename, )
+
## but wait, there's more! here we print a summary of seen message
## types and associated counts.
if seen:
@@ -400,6 +401,7 @@
if unseen:
print '\nUnseen Message Types (help):'
for cls, zero in sorted(unseen):
+ cls = cls[0]
name = cls.__name__
help = unseen_hints.get(name, '')
print ' %s%s' % (name, ' (%s)' % help if help else '', )
=======================================
--- /trunk/demo/example_opt Sun Aug 2 03:17:47 2009
+++ /trunk/demo/example_opt Sat Jan 28 11:01:43 2012
@@ -22,7 +22,7 @@
if __name__ == '__main__':
con = ibConnection()
con.register(my_account_handler, 'UpdateAccountValue')
- con.register(my_tick_handler, message.TickSize, message.TickPrice)
+ con.register(my_tick_handler, message.tickSize, message.tickPrice)
con.connect()

def inner():
=======================================
--- /trunk/demo/option_order_data Sat May 10 20:21:24 2008
+++ /trunk/demo/option_order_data Sat Jan 28 11:01:43 2012
@@ -56,13 +56,13 @@
con.connect()

tickID = 36
- orderID = 50002 + 10
-
- #stkContract = makeStkContract('EUR')
- #con.reqMktData(1, stkContract, '')
+ orderID = -100 #50002 + 10
+
+ stkContract = makeStkContract('EUR')
+ con.reqMktData(1, stkContract, '', '')

optContract = makeOptContract('QQQQ', '20080919', 'C', 34.0)
- #con.reqMktData(tickID, optContract, '')
+ con.reqMktData(tickID, optContract, '', '')
#sleep(5)
#con.cancelMktData(tickID)
#sleep(5)
@@ -72,6 +72,6 @@

print con.reqMktData(tickID, optContract, '', False)

- sleep(10)
+ sleep(5)
con.disconnect()
- sleep(2)
+ sleep(1)
=======================================
--- /trunk/ib/ext/EReader.py Sun Aug 2 03:17:47 2009
+++ /trunk/ib/ext/EReader.py Sat Jan 28 11:01:43 2012
@@ -27,8 +27,6 @@

from ib.lib.logger import logger

-# micro optimizations
-from __builtin__ import float, str, None, True, False

class EReader(Thread):
""" generated source for EReader
=======================================
--- /trunk/ib/ext/Makefile Sat Jan 28 08:15:33 2012
+++ /trunk/ib/ext/Makefile Sat Jan 28 11:01:43 2012
@@ -24,8 +24,8 @@

$(modules):
- #j2py -i $(addprefix $(srcdir), $(addsuffix .java, $(basename $@))) -o $@
-c ib.ext.cfg -c ib.ext.cfg.$(basename $@)
- j2py -i $(addprefix $(srcdir), $(addsuffix .java, $(basename $@))) -o $@
-d cfg
+ j2py -i $(addprefix $(srcdir), $(addsuffix .java, $(basename $@))) -o $@
-c ib.ext.cfg -c ib.ext.cfg.$(basename $@)
+

modules-clean: clean-modules
clean-modules:
=======================================
--- /trunk/ib/ext/cfg/EReader.py Mon Jan 26 16:00:45 2009
+++ /trunk/ib/ext/cfg/EReader.py Sat Jan 28 11:01:43 2012
@@ -18,8 +18,6 @@
'',
'from ib.lib.logger import logger',
'',
- '# micro optimizations',
- 'from __builtin__ import float, str, None, True, False',
]

=======================================
--- /trunk/ib/opt/dispatcher.py Sat Jan 28 08:15:33 2012
+++ /trunk/ib/opt/dispatcher.py Sat Jan 28 11:01:43 2012
@@ -38,7 +38,7 @@
listeners = self.listeners[maybeName(messageType)]
except (KeyError, ):
return results
- message = messageType(**args)
+ message = messageType[0](**args)
for listener in listeners:
try:
results.append(listener(message))
=======================================
--- /trunk/ib/opt/sender.py Sat Jan 28 08:15:33 2012
+++ /trunk/ib/opt/sender.py Sat Jan 28 11:01:43 2012
@@ -69,6 +69,7 @@
raise
if name not in self.clientMethodNames:
return value
+ return value
typeName = toTypeName(name)
preName, postName = name+'Pre', name+'Post'
preType, postType = registry[preName], registry[postName]

Reply all

Reply to author

Forward

0 new messages