[ibpy commit] r324 - in trunk/ib: lib opt

[codesite...@google.com]

Author: troy.melhase
Date: Wed Aug 13 15:19:52 2008
New Revision: 324

Modified:
trunk/ib/lib/logger.py
trunk/ib/opt/message.py

Log:
Added logger name to allow for filtering. Added __len__ method to message
objects.

Modified: trunk/ib/lib/logger.py
==============================================================================
--- trunk/ib/lib/logger.py (original)
+++ trunk/ib/lib/logger.py Wed Aug 13 15:19:52 2008
@@ -10,7 +10,7 @@

##
# Default log message formatting string.
-format = '%(asctime)s %(levelname)-9.9s %(message)s'
+format = '%(name)s %(asctime)s %(levelname)-9.9s %(message)s'

##
# Default log date formatting string.
@@ -33,4 +33,4 @@
@return logging instance (the module)
"""
logging.basicConfig(level=level, format=format, datefmt=datefmt)
- return logging
+ return logging.getLogger(name)

Modified: trunk/ib/opt/message.py
==============================================================================
--- trunk/ib/opt/message.py (original)
+++ trunk/ib/opt/message.py Wed Aug 13 15:19:52 2008
@@ -58,13 +58,19 @@
setattr(self, name, kwds.pop(name, None))
assert not kwds

+ def __len__(self):
+ """ x.__len__() <==> len(x)
+
+ """
+ return len(self.keys())
+
def __str__(self):
""" x.__str__() <==> str(x)

"""
name = self.typeName
items = str.join(', ', ['%s=%s' % item for item in self.items()])
- return '<%s %s>' % (name, ' ' + items if items else '')
+ return '<%s %s>' % (name, items)

def items(self):
""" List of message (slot, slot value) pairs, as 2-tuples.