lingo: coding style (#46504)

combo/apps/lingo/views.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # lingo - basket and payment system
 # Copyright (C) 2015  Entr'ouvert
 #
@@ -138,7 +137,7 @@ class AddBasketItemApiView(View):
         request_body = json.loads(force_text(self.request.body))
         extra = request_body.get('extra', {})
 
-        if not 'amount' in request.GET and not 'amount' in request_body and \
+        if 'amount' not in request.GET and not 'amount' in request_body and \
                 not 'amount' in extra:
             return BadRequestJsonResponse('missing amount parameter')
 
@@ -300,8 +299,11 @@ class ValidateTransactionApiView(View):
             return JsonResponse({'err': 1, 'e': force_text(e)})
 
         logger.info(u'bank validation result: %r', result)
-        operation = TransactionOperation(transaction=transaction,
-                kind='validation', amount=amount, bank_result=result)
+        operation = TransactionOperation(
+            transaction=transaction,
+            kind='validation',
+            amount=amount,
+            bank_result=result)
         operation.save()
 
         return JsonResponse({'err': 0, 'extra': result})
@@ -358,14 +360,12 @@ class PayMixin(object):
                 'regie can only pay one basket item, but handle_payment() received more'
             )
 
-        if remote_items:
-            total_amount = sum([x.amount for x in remote_items])
-        else:
-            total_amount = sum([x.amount for x in items])
+        total_amount = sum([x.amount for x in remote_items or items])
 
         if total_amount < regie.payment_min_amount:
             messages.warning(request, _(u'Minimal payment amount is %s €.') % regie.payment_min_amount)
-            return HttpResponseRedirect(get_payment_status_view(next_url=next_url if remote_items else items[0].source_url))
+            return HttpResponseRedirect(
+                get_payment_status_view(next_url=next_url if remote_items else items[0].source_url))
 
         for item in items:
             if item.regie != regie:

tests/test_lingo_cells.py

@@ -95,6 +95,7 @@ def test_basket_cell(regie, user):
     item.save()
     assert cell.get_badge(context) == {'badge': u'123.45€'}
 
+
 def test_basket_cell_can_pay_only_one_basket_item(regie, user):
     regie.can_pay_only_one_basket_item = True
     regie.save()
@@ -102,8 +103,8 @@ def test_basket_cell_can_pay_only_one_basket_item(regie, user):
     page.save()
     cell = LingoBasketCell(page=page, placeholder='content', order=0)
 
-    item  = BasketItem.objects.create(user=user, regie=regie, subject='foo', amount=123)
-    item2  = BasketItem.objects.create(user=user, regie=regie, subject='bar', amount=123)
+    item = BasketItem.objects.create(user=user, regie=regie, subject='foo', amount=123)
+    BasketItem.objects.create(user=user, regie=regie, subject='bar', amount=123)
 
     context = {'request': RequestFactory(user=user).get('/')}
     context['request'].user = user
@@ -112,7 +113,8 @@ def test_basket_cell_can_pay_only_one_basket_item(regie, user):
     content = cell.render(context)
     assert content.count('Pay') == 2
     assert item.payment_url in content
-    assert not 'Total' in content
+    assert 'Total' not in content
+
 
 def test_recent_transaction_cell(regie, user):
     page = Page(title='xxx', slug='test_basket_cell', template_name='standard')

tests/test_lingo_payment.py

@@ -1537,7 +1537,7 @@ def test_successfull_items_can_pay_only_one_basket_item(app, basket_page, regie,
     regie.can_pay_only_one_basket_item = True
     regie.save()
     item = BasketItem.objects.create(user=user, regie=regie, amount=42, subject='foo item')
-    item2 = BasketItem.objects.create(user=user, regie=regie, amount=84, subject='bar item')
+    BasketItem.objects.create(user=user, regie=regie, amount=84, subject='bar item')
 
     resp = login(app).get('/test_basket_cell/')
     assert 'foo item' in resp.text
@@ -1549,7 +1549,7 @@ def test_successfull_items_can_pay_only_one_basket_item(app, basket_page, regie,
     qs = urlparse.parse_qs(urlparse.urlparse(resp.location).query)
     assert qs['subject'][0] == 'foo item', 'item.subject was not provided to eopayment'
     args = {'transaction_id': qs['transaction_id'][0], 'signed': True, 'ok': True, 'reason': 'Paid'}
-    with mock.patch('combo.utils.requests_wrapper.RequestsSession.request') as request:
+    with mock.patch('combo.utils.requests_wrapper.RequestsSession.request'):
         resp = app.get(get_url(True, 'lingo-callback', regie), params=args)
 
     resp = app.get('/test_basket_cell/')