added encoding. Decided itertools.zip_longest was overkill, refactored to use simpler method.

This commit is contained in:
emilybache 2012-11-21 11:11:46 +01:00
parent 1cf0963de5
commit 7333fc844e
3 changed files with 8 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
class TennisGameDefactored1: class TennisGameDefactored1:

View File

@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
import pytest import pytest
from tennis import TennisGame from tennis import TennisGame

View File

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
import unittest import unittest
from itertools import izip_longest
from tennis import TennisGame from tennis import TennisGame
@ -52,10 +53,10 @@ test_cases = [
def play_game(p1Points, p2Points, p1Name, p2Name): def play_game(p1Points, p2Points, p1Name, p2Name):
game = TennisGame(p1Name, p2Name) game = TennisGame(p1Name, p2Name)
for p1, p2 in izip_longest(range(p1Points), range(p2Points)): for i in range(max(p1Points, p2Points)):
if p1 is not None: if i < p1Points:
game.won_point(p1Name) game.won_point(p1Name)
if p2 is not None: if i < p2Points:
game.won_point(p2Name) game.won_point(p2Name)
return game return game