Code cleanup

eyeonus · Dec 18, 2014 · 2ebd752 · 2ebd752
1 parent b994198
commit 2ebd752
Showing 1 changed file with 44 additions and 10 deletions.
diff --git a/tradedb.py b/tradedb.py
@@ -929,7 +929,10 @@ def _loadCategories(self):
                 SELECT category_id, name
                   FROM Category
             """
-        self.categoryByID = { ID: Category(ID, name, []) for (ID, name) in self.cur.execute(stmt) }
+        self.categoryByID = {
+                ID: Category(ID, name, [])
+                    for (ID, name) in self.cur.execute(stmt)
+        }
 
         self.tdenv.DEBUG1("Loaded {} Categories", len(self.categoryByID))
 
@@ -938,7 +941,11 @@ def lookupCategory(self, name):
         """
             Look up a category by name
         """
-        return TradeDB.listSearch("Category", name, self.categoryByID.values(), key=lambda cat: cat.dbname)
+        return TradeDB.listSearch(
+                "Category", name,
+                self.categoryByID.values(),
+                key=lambda cat: cat.dbname
+        )
 
 
     def items(self):
@@ -959,7 +966,11 @@ def _loadItems(self):
         itemByID, itemByName = {}, {}
         for (ID, name, categoryID) in self.cur.execute(stmt):
             category = self.categoryByID[categoryID]
-            item = Item(ID, name, category, '{}/{}'.format(category.dbname, name), None)
+            item = Item(
+                    ID, name, category,
+                    '{}/{}'.format(category.dbname, name),
+                    None
+            )
             itemByID[ID] = item
             itemByName[name] = item
             category.items.append(item)
@@ -977,20 +988,29 @@ def _loadItems(self):
             item = itemByID[itemID]
             item.altname = altName
             itemByName[altName] = item
-            self.tdenv.DEBUG1("'{}' alias for #{} '{}'", altName, itemID, item.fullname)
+            self.tdenv.DEBUG1(
+                    "'{}' alias for #{} '{}'",
+                    altName, itemID, item.fullname
+            )
 
         self.itemByID = itemByID
         self.itemByName = itemByName
 
-        self.tdenv.DEBUG1("Loaded {:n} Items, {:n} AltItemNames",
-                                len(self.itemByID), aliases)
+        self.tdenv.DEBUG1(
+                "Loaded {:n} Items, {:n} AltItemNames",
+                len(self.itemByID), aliases
+        )
 
 
     def lookupItem(self, name):
         """
             Look up an Item by name using "CATEGORY/Item"
         """
-        return TradeDB.listSearch("Item", name, self.itemByName.items(), key=lambda kvTup: kvTup[0], val=lambda kvTup: kvTup[1])
+        return TradeDB.listSearch(
+                "Item", name, self.itemByName.items(),
+                key=lambda kvTup: kvTup[0],
+                val=lambda kvTup: kvTup[1]
+        )
 
 
     ############################################################
@@ -1026,16 +1046,30 @@ def loadStationTrades(self, fromStationIDs):
         if self.tradingCount is None:
             self.tradingCount = 0
 
-        for (itemID, srcStnID, dstStnID, srcPriceCr, profit, stock, stockLevel, demand, demandLevel, srcAge, dstAge) in self.cur:
+        for (
+                itemID,
+                srcStnID, dstStnID,
+                srcPriceCr, profit,
+                stock, stockLevel,
+                demand, demandLevel,
+                srcAge, dstAge
+        ) in self.cur:
             if srcStnID != prevSrcStnID:
-                srcStn, prevSrcStnID, prevDstStnID = stations[srcStnID], srcStnID, None
+                srcStn = stations[srcStnID]
+                prevSrcStnID = srcStnID
+                prevDstStnID = None
                 assert srcStn.tradingWith is None
                 srcStn.tradingWith = {}
             if dstStnID != prevDstStnID:
                 dstStn, prevDstStnID = stations[dstStnID], dstStnID
                 tradingWith = srcStn.tradingWith[dstStn] = []
                 self.tradingCount += 1
-            tradingWith.append(Trade(items[itemID], itemID, srcPriceCr, profit, stock, stockLevel, demand, demandLevel, srcAge, dstAge))
+            tradingWith.append(Trade(
+                    items[itemID], itemID,
+                    srcPriceCr, profit,
+                    stock, stockLevel,
+                    demand, demandLevel,
+                    srcAge, dstAge))
 
 
     def getTrades(self, src, dst):