diff --git a/api/helpers.py b/api/helpers.py index c1e961c..b5a56e3 100644 --- a/api/helpers.py +++ b/api/helpers.py @@ -2,6 +2,7 @@ import json from flask import request, current_app, Response + def check_api_key(): api_keys = current_app.config.get("API_KEYS") if not api_keys: @@ -13,4 +14,4 @@ def check_api_key(): return Response( response, 401, {'WWW-Authenticate': 'Basic realm="Login Required"'} - ) \ No newline at end of file + ) diff --git a/api/lib/prices.py b/api/lib/prices.py index 24e7b13..4f20a75 100644 --- a/api/lib/prices.py +++ b/api/lib/prices.py @@ -95,4 +95,4 @@ def canvas_price(width, height, market, framed=True, designer=None, reseller=Non if inc_vat: price *= market.vat - return round(price) \ No newline at end of file + return round(price) diff --git a/tests/test_price.py b/tests/test_price.py index 480b1cf..4b0e6ad 100644 --- a/tests/test_price.py +++ b/tests/test_price.py @@ -63,12 +63,20 @@ class TestPrice(unittest2.TestCase): self.assertEqual(0.208, canvas_cm2_price(1000)) def test_canvas_price(self): - self.assertEqual(460, canvas_price(width=50, height=50, market=sweden, framed=True, inc_vat=False)) - self.assertEqual(960, canvas_price(width=100, height=100, market=sweden, framed=True, inc_vat=False)) - self.assertEqual(1359, canvas_price(width=150, height=120, market=sweden, framed=True, inc_vat=False)) - self.assertEqual(256000, canvas_price(width=2000, height=2000, market=sweden, framed=True, inc_vat=False)) - self.assertEqual(397, canvas_price(width=10, height=10, market=sweden, framed=True, inc_vat=False)) - self.assertEqual(672, canvas_price(width=100, height=100, market=sweden, framed=False, inc_vat=False)) - self.assertEqual(840, canvas_price(width=100, height=100, market=sweden, framed=False, inc_vat=True)) + self.assertEqual(460, canvas_price(width=50, height=50, + market=sweden, framed=True, inc_vat=False)) + self.assertEqual(960, canvas_price( + width=100, height=100, market=sweden, framed=True, inc_vat=False)) + self.assertEqual(1359, canvas_price( + width=150, height=120, market=sweden, framed=True, inc_vat=False)) + self.assertEqual(256000, canvas_price( + width=2000, height=2000, market=sweden, framed=True, inc_vat=False)) + self.assertEqual(397, canvas_price(width=10, height=10, + market=sweden, framed=True, inc_vat=False)) + self.assertEqual(672, canvas_price( + width=100, height=100, market=sweden, framed=False, inc_vat=False)) + self.assertEqual(840, canvas_price( + width=100, height=100, market=sweden, framed=False, inc_vat=True)) - self.assertEqual(436, canvas_price(width=50, height=50, market=denmark, framed=True, inc_vat=False)) + self.assertEqual(436, canvas_price(width=50, height=50, + market=denmark, framed=True, inc_vat=False))