From 5fb9f52b48630c2588b2c90093b4a99af412d5f7 Mon Sep 17 00:00:00 2001 From: emilybache Date: Wed, 21 Nov 2012 10:21:22 +0100 Subject: [PATCH] added encoding, fixed som PEP-8 issues. Thanks to apieum for these changes. --- GildedRose/python/gilded_rose.py | 22 ++++++++++++---------- GildedRose/python/test_gilded_rose.py | 5 +++-- GildedRose/python/texttest_fixture.py | 6 +++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/GildedRose/python/gilded_rose.py b/GildedRose/python/gilded_rose.py index 334bec86..67ea3849 100755 --- a/GildedRose/python/gilded_rose.py +++ b/GildedRose/python/gilded_rose.py @@ -1,41 +1,43 @@ +# -*- coding: utf-8 -*- + def update_quality(items): for item in items: if item.name != "Aged Brie" and item.name != "Backstage passes to a TAFKAL80ETC concert": if item.quality > 0: if item.name != "Sulfuras, Hand of Ragnaros": - item.quality = item.quality - 1; + item.quality = item.quality - 1 else: if item.quality < 50: - item.quality = item.quality + 1; + item.quality = item.quality + 1 if item.name == "Backstage passes to a TAFKAL80ETC concert": if item.sell_in < 11: if item.quality < 50: - item.quality = item.quality + 1; + item.quality = item.quality + 1 if item.sell_in < 6: if item.quality < 50: - item.quality = item.quality + 1; + item.quality = item.quality + 1 if item.name != "Sulfuras, Hand of Ragnaros": - item.sell_in = item.sell_in - 1; + item.sell_in = item.sell_in - 1 if item.sell_in < 0: if item.name != "Aged Brie": if item.name != "Backstage passes to a TAFKAL80ETC concert": if item.quality > 0: if item.name != "Sulfuras, Hand of Ragnaros": - item.quality = item.quality - 1; + item.quality = item.quality - 1 else: - item.quality = item.quality - item.quality; + item.quality = item.quality - item.quality else: if item.quality < 50: - item.quality = item.quality + 1; + item.quality = item.quality + 1 return items + class Item: def __init__(self, name, sell_in, quality): self.name = name self.sell_in = sell_in self.quality = quality - + def __repr__(self): return "%s, %s, %s" % (self.name, self.sell_in, self.quality) - diff --git a/GildedRose/python/test_gilded_rose.py b/GildedRose/python/test_gilded_rose.py index 51e15ba5..e615c2ca 100644 --- a/GildedRose/python/test_gilded_rose.py +++ b/GildedRose/python/test_gilded_rose.py @@ -1,7 +1,8 @@ +# -*- coding: utf-8 -*- import unittest - from gilded_rose import Item, update_quality + class GildedRoseTest(unittest.TestCase): def test_foo(self): items = [Item("foo", 0, 0)] @@ -10,4 +11,4 @@ class GildedRoseTest(unittest.TestCase): if __name__ == "__main__": - unittest.main() \ No newline at end of file + unittest.main() diff --git a/GildedRose/python/texttest_fixture.py b/GildedRose/python/texttest_fixture.py index b85634c1..de921093 100644 --- a/GildedRose/python/texttest_fixture.py +++ b/GildedRose/python/texttest_fixture.py @@ -1,5 +1,5 @@ +# -*- coding: utf-8 -*- from __future__ import print_function - from gilded_rose import * if __name__ == "__main__": @@ -13,9 +13,9 @@ if __name__ == "__main__": Item(name="Backstage passes to a TAFKAL80ETC concert", sell_in=15, quality=20), Item(name="Backstage passes to a TAFKAL80ETC concert", sell_in=10, quality=49), Item(name="Backstage passes to a TAFKAL80ETC concert", sell_in=5, quality=49), - Item(name="Conjured Mana Cake", sell_in=3, quality=6), # <-- :O + Item(name="Conjured Mana Cake", sell_in=3, quality=6), # <-- :O ] - + days = 2 import sys if len(sys.argv) > 1: