short break

src/rethink/portfolio_column_chart.py

@@ -43,7 +43,7 @@ class PortfolioColumnChart():
         self.never_been_run = True
     
     def get_object_name(self):
-        return json.dumps({'account': self.pf.account, 'id': id(), 'class': self.__class__.__name__})
+        return json.dumps({'account': self.pf.account, 'id': id(self), 'class': self.__class__.__name__})
     
     def ckey_to_row(self, contract_key):
         

src/rethink/portfolio_item.py

@@ -235,7 +235,7 @@ class Portfolio(AbstractTableModel):
         AbstractTableModel.__init__(self)
         
     def get_object_name(self):
-        return json.dumps({'account': self.account, 'id': id(), 'class': self.__class__.__name__})
+        return json.dumps({'account': self.account, 'id': id(self), 'class': self.__class__.__name__})
     
     def is_contract_in_portfolio(self, contract_key):
         return self.get_portfolio_port_item(contract_key)

src/rethink/portfolio_monitor.py

@@ -450,7 +450,7 @@ class PortfolioMonitor(AbstractGatewayListener, AbstractPortfolioTableModelListe
                                                       'data_table_json': self.portfolios[account].get_JSON()}))
         except:
             logging.error("PortfolioMonitor:event_tm_request_table_structure. Error invoking get_JSON[%s]. Client request id:%s, %s" %
-                            account, request_id, ', '.join(e for e in sys.exc_info()))
+                            (account, request_id, ', '.join(e for e in sys.exc_info())))
             
     def event_tm_table_structure_changed(self, event, source, origin_request_id, account, data_table_json):
         logging.info("[PortfolioColumnChartTM:] received %s  content:[%s]" % (event, data_table_json)    )        

src/ws/ws_server.py

@@ -338,7 +338,7 @@ class MainWebSocketServer(BaseWebSocketServerWrapper):
     def message_received(self, client, server, message):
         print 'message received %s' % message
         self.message_handler.send_message(AbstractTableModel.EVENT_TM_REQUEST_TABLE_STRUCTURE, 
-                                          json.dumps({'request_id' : client['id'], 'target_resource': 'Portfolio', 'account': 'U8379890'}))
+                                          json.dumps({'request_id' : client['id'], 'target_resource': {'class': 'Portfolio'}, 'account': 'U8379890'}))