bank-account: Formatting

Author: thecouchcoder

exercises/bank-account/bank_account.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 
 
 class BankAccount(object):
@@ -20,29 +19,3 @@ def withdraw(self, amount):
 
     def close(self):
         pass
-=======
-import threading
-
-class BankAccount(object):
-	def __init__(self):
-		pass
-
-	def getBalance(self):
-		pass
-
-	def open(self):
-		pass
-
-	def deposit(self, amount):
-		pass
-
-
-	def withdraw(self, amount):
-		pass
-
-	def close(self):
-		pass
-
-
-
->>>>>>> b8e7ac1... bank-account: exercise configuration

exercises/bank-account/bank_account_test.py

@@ -3,6 +3,7 @@
 
 from bank_account import BankAccount
 
+
 class BankAccountTests(unittest.TestCase):
 
     def test_newly_opened_account_has_zero_balance(self):
@@ -24,19 +25,6 @@ def test_get_balance_with_amount(self):
 
         self.assertEqual(self.account.getBalance(), 100)
 
-    def test_get_balance_0(self):
-        self.account = BankAccount()
-        self.account.open()
-
-        self.assertEqual(self.account.getBalance(), 0)
-
-    def test_get_balance_with_amount(self):
-        self.account = BankAccount()
-        self.account.open()
-        self.account.deposit(100)
-
-        self.assertEqual(self.account.getBalance(), 100)
-
     def test_deposit_into_account(self):
         self.account = BankAccount()
         self.account.open()
@@ -76,8 +64,6 @@ def test_deposit_into_closed_account(self):
         with self.assertRaises(Exception):
             self.account.deposit(50)
 
-
-
     def test_withdraw_from_closed_account(self):
         self.account = BankAccount()
         self.account.open()
@@ -109,8 +95,6 @@ def test_cannot_deposit_negative(self):
         with self.assertRaises(Exception):
             self.account.deposit(-50)
 
-
-
     def test_can_handle_concurrent_transactions(self):
         def increment_and_decrement(self):
             self.account.deposit(10)
@@ -124,9 +108,10 @@ def increment_and_decrement(self):
 
         threadlist = []
         threads = 100
-        i=0
-        while (i<threads):
-            thread = threading.Thread(target=increment_and_decrement, args=(self, ))
+        i = 0
+        while (i < threads):
+            thread = threading.Thread(target=increment_and_decrement,
+                                      args=(self, ))
             threadlist.append(thread)
             i += 1
 
@@ -138,5 +123,6 @@ def increment_and_decrement(self):
 
         self.assertEqual(self.account.getBalance(), 900)
 
+
 if __name__ == '__main__':
-    unittest.main();
+    unittest.main()

exercises/bank-account/example.py

@@ -1,53 +1,44 @@
 import threading
 
-class BankAccount(object):
-	def __init__(self):
-		self.lock = threading.Lock()
-
-	def getBalance(self):
-		self.lock.acquire()
-		if (self.open == True):
-			self.lock.release()
-			return self.balance
-		else:
-			self.lock.release()
-			raise Exception
-
-	def getBalance(self):
-		self.lock.acquire()
-		if (self.open == True):
-			self.lock.release()
-			return self.balance
-		else:
-			self.lock.release()
-			raise Exception
-
-	def open(self):
-		self.lock.acquire()
-		self.balance = 0
-		self.open = True
-		self.lock.release()
 
-	def deposit(self, amount):
-		self.lock.acquire()
-		if (self.open == True and amount>0):
-			self.balance += amount
-			self.lock.release()
-		else:
-			self.lock.release()
-			raise Exception
-
-
-	def withdraw(self, amount):
-		self.lock.acquire()
-		if (self.open == True and self.balance >= amount and amount>0):
-			self.balance -= amount
-			self.lock.release()
-		else:
-			self.lock.release()
-			raise Exception
-
-	def close(self):
-		self.lock.acquire()
-		self.open = False
-		self.lock.release()
+class BankAccount(object):
+    def __init__(self):
+        self.lock = threading.Lock()
+
+    def getBalance(self):
+        self.lock.acquire()
+        if (self.open is True):
+            self.lock.release()
+            return self.balance
+        else:
+            self.lock.release()
+            raise Exception
+
+    def open(self):
+        self.lock.acquire()
+        self.balance = 0
+        self.open = True
+        self.lock.release()
+
+    def deposit(self, amount):
+        self.lock.acquire()
+        if (self.open is True and amount > 0):
+            self.balance += amount
+            self.lock.release()
+        else:
+            self.lock.release()
+            raise Exception
+
+    def withdraw(self, amount):
+        self.lock.acquire()
+        if (self.open is True and self.balance >= amount and amount > 0):
+            self.balance -= amount
+            self.lock.release()
+        else:
+            self.lock.release()
+            raise Exception
+
+    def close(self):
+        self.lock.acquire()
+        self.open = False
+        self.lock.release()