Skip to content

Commit 0e3a0d6

Browse files
meejahmeejah
committed
flake8/whitespace
1 parent f818f13 commit 0e3a0d6

File tree

4 files changed

+53
-49
lines changed

4 files changed

+53
-49
lines changed

‎test_pytest.py

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import ttt
44

5+
56
class TestTTT(unittest.TestCase):
67

78
def test_invalid_wrong_size(self):

‎test_ttt.py

+26-25
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import ttt
44
from ttt import Board, GameStates
55

6-
class TestTTT( unittest.TestCase ):
6+
7+
class TestTTT(unittest.TestCase):
78

89
def setUp(self):
910
self.valid = list("xo.xo.xo.")
@@ -15,48 +16,48 @@ def test_1(self):
1516
# with self.assertRaises(AssertionError):
1617
# Board("")
1718

18-
self.assertTrue( Board(['x']*9) )
19+
self.assertTrue(Board(['x']*9))
1920

2021
def test_2(self):
2122
b = Board(self.valid)
2223
self.assertEqual(self.valid, b.board)
2324

2425
def test_3(self):
2526
b = Board(self.valid)
26-
self.assertEqual(list('xxx'), b.col(0) )
27-
self.assertEqual(list('ooo'), b.col(1) )
28-
self.assertEqual(list('...'), b.col(2) )
27+
self.assertEqual(list('xxx'), b.col(0))
28+
self.assertEqual(list('ooo'), b.col(1))
29+
self.assertEqual(list('...'), b.col(2))
2930

3031
def test_4(self):
3132
b = Board(self.valid)
32-
self.assertEqual(list('xo.'), b.row(0) )
33-
self.assertEqual(list('xo.'), b.row(1) )
34-
self.assertEqual(list('xo.'), b.row(2) )
35-
33+
self.assertEqual(list('xo.'), b.row(0))
34+
self.assertEqual(list('xo.'), b.row(1))
35+
self.assertEqual(list('xo.'), b.row(2))
3636

3737
def test_5(self):
3838
b = Board(self.valid)
39-
self.assertEqual(list('xo.'), b.diag(0) )
40-
self.assertEqual(list('.ox'), b.diag(1) )
39+
self.assertEqual(list('xo.'), b.diag(0))
40+
self.assertEqual(list('.ox'), b.diag(1))
4141

4242
def test_bad_boards(self):
4343

4444
# or something
45-
self.assertEqual( GameStates.invalid, ttt.game_state( None ) )
46-
self.assertEqual( GameStates.invalid, ttt.game_state( "xo.ox.ox." ) )
47-
self.assertEqual( GameStates.invalid, ttt.game_state( [] ) )
48-
self.assertEqual( GameStates.invalid, ttt.game_state( ['.']*8 ) )
49-
self.assertEqual( GameStates.invalid, ttt.game_state( ['.']*10 ) )
50-
self.assertEqual( GameStates.invalid, ttt.game_state( ['x']*2 + ['.']*7 ) )
51-
self.assertEqual( GameStates.invalid, ttt.game_state( ['o']*2 + ['.']*7 ) )
52-
self.assertEqual( GameStates.invalid, ttt.game_state( ['o']*1 + ['.']*8 ) ) # x goes first
45+
self.assertEqual(GameStates.invalid, ttt.game_state(None))
46+
self.assertEqual(GameStates.invalid, ttt.game_state("xo.ox.ox."))
47+
self.assertEqual(GameStates.invalid, ttt.game_state([]))
48+
self.assertEqual(GameStates.invalid, ttt.game_state(['.']*8))
49+
self.assertEqual(GameStates.invalid, ttt.game_state(['.']*10))
50+
self.assertEqual(GameStates.invalid, ttt.game_state(['x']*2 + ['.']*7))
51+
self.assertEqual(GameStates.invalid, ttt.game_state(['o']*2 + ['.']*7))
52+
# x goes first
53+
self.assertEqual(GameStates.invalid, ttt.game_state(['o']*1 + ['.']*8))
5354

5455
def test_good_boards(self):
55-
self.assertEqual( GameStates.unfinished, ttt.game_state(['.']*9) )
56-
self.assertEqual( GameStates.x_wins, ttt.game_state( list("xxx.oo...") ) )
57-
self.assertEqual( GameStates.x_wins, ttt.game_state( list("xo.xo.x..") ) )
58-
self.assertEqual( GameStates.o_wins, ttt.game_state( list("ooo.xx.x.") ) )
56+
self.assertEqual(GameStates.unfinished, ttt.game_state(['.']*9))
57+
self.assertEqual(GameStates.x_wins, ttt.game_state(list("xxx.oo...")))
58+
self.assertEqual(GameStates.x_wins, ttt.game_state(list("xo.xo.x..")))
59+
self.assertEqual(GameStates.o_wins, ttt.game_state(list("ooo.xx.x.")))
5960

6061
def test_10(self):
61-
self.assertEqual( GameStates.invalid, ttt.game_state( list("xo.xo.xo.") ) )
62-
self.assertEqual( GameStates.draw, ttt.game_state( list("xoxxoxoxo") ) )
62+
self.assertEqual(GameStates.invalid, ttt.game_state(list("xo.xo.xo.")))
63+
self.assertEqual(GameStates.draw, ttt.game_state(list("xoxxoxoxo")))

‎test_uber.py

+23-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import unittest
22
import itertools
3-
import math
43

54
import ttt
65
from ttt import GameStates
@@ -15,41 +14,44 @@
1514
give another 15 minutes
1615
"""
1716

17+
1818
def all_boards():
19-
for a in itertools.product('xo.',repeat=3):
20-
for b in itertools.product('xo.',repeat=3):
21-
for c in itertools.product('xo.',repeat=3):
19+
for a in itertools.product('xo.', repeat=3):
20+
for b in itertools.product('xo.', repeat=3):
21+
for c in itertools.product('xo.', repeat=3):
2222
yield a+b+c
2323

24-
class UberTestTTT( unittest.TestCase ):
24+
25+
class UberTestTTT(unittest.TestCase):
2526

2627
def test_bad_boards(self):
2728

2829
# or something
29-
self.assertEqual( GameStates.invalid, ttt.game_state( None ) )
30-
self.assertEqual( GameStates.invalid, ttt.game_state( "xo.ox.ox." ) )
31-
self.assertEqual( GameStates.invalid, ttt.game_state( [] ) )
32-
self.assertEqual( GameStates.invalid, ttt.game_state( ['.']*8 ) )
33-
self.assertEqual( GameStates.invalid, ttt.game_state( ['.']*10 ) )
34-
self.assertEqual( GameStates.invalid, ttt.game_state( ['x']*2 + ['.']*7 ) )
35-
self.assertEqual( GameStates.invalid, ttt.game_state( ['o']*2 + ['.']*7 ) )
36-
self.assertEqual( GameStates.invalid, ttt.game_state( ['o']*1 + ['.']*8 ) ) # x goes first
30+
self.assertEqual(GameStates.invalid, ttt.game_state(None))
31+
self.assertEqual(GameStates.invalid, ttt.game_state("xo.ox.ox."))
32+
self.assertEqual(GameStates.invalid, ttt.game_state([]))
33+
self.assertEqual(GameStates.invalid, ttt.game_state(['.']*8))
34+
self.assertEqual(GameStates.invalid, ttt.game_state(['.']*10))
35+
self.assertEqual(GameStates.invalid, ttt.game_state(['x']*2 + ['.']*7))
36+
self.assertEqual(GameStates.invalid, ttt.game_state(['o']*2 + ['.']*7))
37+
# x goes first
38+
self.assertEqual(GameStates.invalid, ttt.game_state(['o']*1 + ['.']*8))
3739

3840
def test_all_perms(self):
3941
results = {}
4042

4143
for board in all_boards():
4244
# if board == list("xoxxoxoxo"):
4345
# print board
44-
e = ttt.game_state( list(board) )
45-
results[e] = results.get(e,0) + 1
46+
e = ttt.game_state(list(board))
47+
results[e] = results.get(e, 0) + 1
4648

4749
# {0: 13815, 2: 920, 1: 4520, 3: 412, 4: 16}
4850
print results
49-
self.assertEqual( 3**9, sum(results.values()) )
51+
self.assertEqual(3**9, sum(results.values()))
5052

51-
self.assertEqual( 13815, results[GameStates.invalid] )
52-
self.assertEqual( 4520, results[GameStates.unfinished] )
53-
self.assertEqual( 920, results[GameStates.x_wins] )
54-
self.assertEqual( 412, results[GameStates.o_wins] )
55-
self.assertEqual( 16, results[GameStates.draw] )
53+
self.assertEqual(13815, results[GameStates.invalid])
54+
self.assertEqual(4520, results[GameStates.unfinished])
55+
self.assertEqual(920, results[GameStates.x_wins])
56+
self.assertEqual(412, results[GameStates.o_wins])
57+
self.assertEqual(16, results[GameStates.draw])

‎ttt.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import types
99

10+
1011
class GameStates(object):
1112
"""
1213
there are lots of ways to accomplish an enum like object
@@ -31,11 +32,10 @@ def __init__(self, board):
3132
def row(self, n):
3233
return self.board[n*3:n*3+3]
3334

34-
3535
def col(self, n):
3636
ret = []
3737
for i in range(3):
38-
ret.append( self.board[n+i*3] )
38+
ret.append(self.board[n+i*3])
3939

4040
return ret
4141

@@ -58,7 +58,7 @@ def current_state(self):
5858
if len(self.board) != 9:
5959
return GameStates.invalid
6060

61-
if abs( self.board.count('x') - self.board.count('o') ) > 1:
61+
if abs(self.board.count('x') - self.board.count('o')) > 1:
6262
return GameStates.invalid
6363

6464
if self.board.count('x') < self.board.count('o'):

0 commit comments

Comments
 (0)