Merge branch 'master' of ssh://gitredgreen/RedGreen/twgs-proxy

flexible.py

@@ -1166,7 +1166,7 @@ class ProxyMenu(object):
 
         if key == "T":
             self.queue_game.put(self.c + key + self.r + self.nl)
-
+            # Trade Report
             # do we have enough information to do this?
 
             if not hasattr(self.game, 'portdata') and not hasattr(self.game, 'warpdata'):
@@ -1191,7 +1191,7 @@ class ProxyMenu(object):
             return
         elif key == "W":
             self.queue_game.put(self.c + key + self.r + self.nl)
-            # Activate CIM Port Report
+            # Activate CIM Warp Report
             report = CIMWarpReport(self.game)
             d = report.whenDone()
             d.addCallback(self.warp_report)
@@ -1199,12 +1199,17 @@ class ProxyMenu(object):
             return
         elif key == "S":
             self.queue_game.put(self.c + key + self.r + self.nl)
+            # Scripts
             self.activate_scripts_menu()
             return
         elif key == "D":
             self.queue_game.put(self.c + key + self.r + self.nl)
-            for t in self.trade_report:
-                self.queue_game.put(t + self.nl)
+            # (Re) Display Trade Report
+            if self.trade_report:
+                for t in self.trade_report:
+                    self.queue_game.put(t + self.nl)
+            else:
+                self.queue_game.put("Missing trade_report." + self.nl)
             # self.queue_game.put(pformat(self.portdata).replace("\n", "\n\r") + self.nl)
             # self.queue_game.put(pformat(self.warpdata).replace("\n", "\n\r") + self.nl)    
         elif key == "Q":