X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=BankAccount.py;h=6565b6573523c1ceb7db2b1fda83e3a85450b960;hp=ae33dd93f1d59add43600d6a1891a84e64a642a1;hb=38b21b79dca47b875d3005a4708163d77664d223;hpb=f05c577752de80a1bfed292951d1b7d7003e329c

diff --git a/BankAccount.py b/BankAccount.py
index ae33dd9..6565b65 100644
--- a/BankAccount.py
+++ b/BankAccount.py
@@ -19,7 +19,7 @@ class BankAccount:
 	def sanity_check_user(self, user):
 		wanted_fields = ['balance']
 		for f in user:
-			if wanted_fields.has_key(f):
+			if f in wanted_fields:
 				if f == 'balance':
 					if not isinstance(user['balance'], tuple):
 						return False
@@ -54,11 +54,13 @@ class BankAccount:
 
 	def get_balance(self, username):
 		if self.bank.has_key(username):
-			return self.bank['username']['balance']
+			return self.bank[username]['balance']
 		return (0,0)
 
 	def add_amount(self, username, amount):
-		ensure_user_exists(username)
-		self.bank['username']['balance'][0] += amount[0]
-		self.bank['username']['balance'][1] += amount[1]
+		self.ensure_user_exists(username)
+		(cur_cents, cur_bytes) = self.bank[username]['balance']
+		(add_cents, add_bytes) = amount
+		self.bank[username]['balance'] = (cur_cents+add_cents,
+			cur_bytes+add_bytes)
 		self.save()