Merge pull request #101 from fau-fablab/refactor-hasKey

REFACTOR replace .hasKey with in

Author: patkan

FabLabKasse/cashPayment/cashState.py

@@ -615,7 +615,7 @@ def printFormatted(output):
         dev = row[0]
         # state: compute delta, because the DB only stores the total
         currentState = CashState.fromJSON(row[2])
-        if previousStates.has_key(dev):
+        if dev in previousStates:
             delta = currentState - previousStates[dev]
             delta = delta.toVerboseString()
         else:

FabLabKasse/cashPayment/server/mdbCash/mdb.py

@@ -544,7 +544,7 @@ def dispenseValue(self, maximumDispense):
         # get number of avail. coins by value
         coinsAvailable = {}
         for [coinType, coinValue] in sortedCoinValues:
-            if not coinsAvailable.has_key(coinValue):
+            if coinValue not in coinsAvailable:
                 coinsAvailable[coinValue] = 0
             coinsAvailable[coinValue] += tubeStatus[coinType]["count"]
 
@@ -553,7 +553,7 @@ def shouldSplit(coinValue):
             so that the coin storage does not run short of often paid out coins (like 1€)
             this will only happen if more than enough of the smaller coins (like 50c) are present
             """
-            if not coinsAvailable.has_key(coinValue / 2):
+            if (coinValue / 2) not in coinsAvailable:
                 # there is no "half" coin of the currently used value
                 # TODO implement something for splitting 50c -> 20c+10c
                 return False

FabLabKasse/shopping/backend/oerp.py

@@ -128,7 +128,7 @@ def create_order(self):
         partner_id = self.cfg.getint('openerp', 'anonymous_partner_id')
         order_data = self.oerp.execute('sale.order', 'onchange_partner_id', [], partner_id)
         print order_data
-        assert not order_data.has_key('warning'), u"failed getting default values for sale.order: {}".format(order_data['warning'])
+        assert 'warning' not in order_data, u"failed getting default values for sale.order: {}".format(order_data['warning'])
         order_data = order_data['value']
         order_data.update({'partner_id': partner_id,
                            'order_policy': 'manual',

FabLabKasse/shopping/backend/offline_base.py

@@ -77,21 +77,21 @@ def __init__(self, root_category_id, categories=None, products=None, generate_ro
         for i in products:
             self.add_product(i)
 
-        assert self.categories.has_key(self.root_category_id), "missing root category"
+        assert self.root_category_id in self.categories, "missing root category"
         cfg = scriptHelper.getConfig()
-        assert self.products.has_key(
-            cfg.getint('payup_methods', 'overpayment_product_id')), "missing product for overpayment"
-        assert self.products.has_key(
-            cfg.getint('payup_methods', 'payout_impossible_product_id')), "missing product for payout_impossible"
+        assert cfg.getint('payup_methods', 'overpayment_product_id') in self.products, "missing product for overpayment"
+        assert cfg.getint('payup_methods', 'payout_impossible_product_id') in self.products,\
+            "missing product for payout_impossible"
 
     def add_category(self, category):
         categ_id = category.categ_id
-        assert not self.categories.has_key(categ_id), "Category {} {} already exists: {}".format(categ_id, repr(category.name), repr(self.categories[categ_id].name))
+        assert categ_id not in self.categories, "Category {} {} already exists: {}".format(
+            categ_id, repr(category.name), repr(self.categories[categ_id].name))
         self.categories[categ_id] = category
 
     def add_product(self, product):
         prod_id = product.prod_id
-        assert not self.products.has_key(prod_id), "Product already exists"
+        assert prod_id not in self.products, "Product already exists"
         self.products[prod_id] = product
 
     def get_root_category(self):
@@ -152,7 +152,7 @@ def get_product(self, prod_id):
 
     def get_category_path(self, categ_id):
         path = []
-        assert self.categories.has_key(categ_id), "invalid category id {}".format(categ_id)
+        assert categ_id in self.categories, "invalid category id {}".format(categ_id)
         while categ_id not in [None, self.root_category_id]:
             try:
                 path.insert(0, self.categories[categ_id])