photowall/api2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pep8 it

Browse Source
This commit is contained in:
Martin
2016-08-08 15:21:30 +02:00
parent da96b4c183
commit 46b5f116be
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/helpers.py
+2 -1
View File
@@ -2,6 +2,7 @@
import json import json
from flask import request, current_app, Response from flask import request, current_app, Response
def check_api_key(): def check_api_key():
api_keys = current_app.config.get("API_KEYS") api_keys = current_app.config.get("API_KEYS")
if not api_keys: if not api_keys:
@@ -13,4 +14,4 @@ def check_api_key():
return Response( return Response(
response, 401, response, 401,
{'WWW-Authenticate': 'Basic realm="Login Required"'} {'WWW-Authenticate': 'Basic realm="Login Required"'}
) )
api/lib/prices.py
+1 -1
View File
@@ -95,4 +95,4 @@ def canvas_price(width, height, market, framed=True, designer=None, reseller=Non
if inc_vat: if inc_vat:
price *= market.vat price *= market.vat
return round(price) return round(price)
tests/test_price.py
+16 -8
View File
@@ -63,12 +63,20 @@ class TestPrice(unittest2.TestCase):
self.assertEqual(0.208, canvas_cm2_price(1000)) self.assertEqual(0.208, canvas_cm2_price(1000))
def test_canvas_price(self): def test_canvas_price(self):
self.assertEqual(460, canvas_price(width=50, height=50, market=sweden, framed=True, inc_vat=False)) self.assertEqual(460, canvas_price(width=50, height=50,
self.assertEqual(960, canvas_price(width=100, height=100, market=sweden, framed=True, inc_vat=False)) 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(960, canvas_price(
self.assertEqual(256000, canvas_price(width=2000, height=2000, market=sweden, framed=True, inc_vat=False)) width=100, height=100, 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(1359, canvas_price(
self.assertEqual(672, canvas_price(width=100, height=100, market=sweden, framed=False, inc_vat=False)) width=150, height=120, market=sweden, framed=True, inc_vat=False))
self.assertEqual(840, canvas_price(width=100, height=100, market=sweden, framed=False, inc_vat=True)) 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))