From ba0a5d0d27cf76ac9a1929768c10572a779a04ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Thu, 1 Sep 2016 00:45:44 +0200 Subject: [PATCH 1/3] Py2 compatible --- kfet/autocomplete.py | 6 ++++++ kfet/backends.py | 6 ++++++ kfet/consumers.py | 6 ++++++ kfet/context_processors.py | 6 ++++++ kfet/decorators.py | 6 ++++++ kfet/forms.py | 6 ++++++ kfet/middleware.py | 6 ++++++ kfet/models.py | 6 ++++++ kfet/routing.py | 6 ++++++ kfet/templatetags/kfet_tags.py | 9 ++++++++- kfet/tests.py | 6 ++++++ kfet/urls.py | 6 ++++++ kfet/views.py | 6 ++++++ 13 files changed, 80 insertions(+), 1 deletion(-) diff --git a/kfet/autocomplete.py b/kfet/autocomplete.py index bce0210a..e4203bd1 100644 --- a/kfet/autocomplete.py +++ b/kfet/autocomplete.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from django.shortcuts import render from django.http import Http404 from django.db.models import Q diff --git a/kfet/backends.py b/kfet/backends.py index 4eea72b5..6f917310 100644 --- a/kfet/backends.py +++ b/kfet/backends.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + import hashlib from django.contrib.auth.models import User, Permission diff --git a/kfet/consumers.py b/kfet/consumers.py index fc67a512..dcd69bdf 100644 --- a/kfet/consumers.py +++ b/kfet/consumers.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from channels import Group from channels.generic.websockets import JsonWebsocketConsumer diff --git a/kfet/context_processors.py b/kfet/context_processors.py index 1bd8052c..ef4f2e64 100644 --- a/kfet/context_processors.py +++ b/kfet/context_processors.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from django.contrib.auth.context_processors import PermWrapper def auth(request): diff --git a/kfet/decorators.py b/kfet/decorators.py index 5d60d58e..9af9247f 100644 --- a/kfet/decorators.py +++ b/kfet/decorators.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from django_cas_ng.decorators import user_passes_test def kfet_is_team(user): diff --git a/kfet/forms.py b/kfet/forms.py index 64c39bb2..0ec3b114 100644 --- a/kfet/forms.py +++ b/kfet/forms.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from decimal import Decimal from django import forms from django.core.exceptions import ValidationError diff --git a/kfet/middleware.py b/kfet/middleware.py index c6faf6c5..50e5d6b7 100644 --- a/kfet/middleware.py +++ b/kfet/middleware.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from kfet.backends import KFetBackend class KFetAuthenticationMiddleware(object): diff --git a/kfet/models.py b/kfet/models.py index ce337785..c59be9e3 100644 --- a/kfet/models.py +++ b/kfet/models.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from django.db import models from django.core.urlresolvers import reverse from django.core.exceptions import PermissionDenied, ValidationError diff --git a/kfet/routing.py b/kfet/routing.py index a1f1c676..f5fe4544 100644 --- a/kfet/routing.py +++ b/kfet/routing.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from channels.routing import route, route_class from kfet import consumers diff --git a/kfet/templatetags/kfet_tags.py b/kfet/templatetags/kfet_tags.py index 799554eb..bb8bce9f 100644 --- a/kfet/templatetags/kfet_tags.py +++ b/kfet/templatetags/kfet_tags.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from django import template from django.utils.html import escape from django.utils.safestring import mark_safe @@ -31,4 +37,5 @@ def highlight_clipper(clipper, q): @register.filter() def ukf(balance, is_cof): grant = is_cof and (1 + Settings.SUBVENTION_COF() / 100) or 1 - return round(balance * 10 * grant) + # float nécessaire car sinon problème avec le round de future.builtins + return round(float(balance * 10 * grant)) diff --git a/kfet/tests.py b/kfet/tests.py index 7ce503c2..03ee6fc6 100644 --- a/kfet/tests.py +++ b/kfet/tests.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from django.test import TestCase # Create your tests here. diff --git a/kfet/urls.py b/kfet/urls.py index 5f898d6e..3422c671 100644 --- a/kfet/urls.py +++ b/kfet/urls.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from django.conf.urls import url from django.contrib.auth.decorators import permission_required from kfet import views diff --git a/kfet/views.py b/kfet/views.py index f2912160..315a473d 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -1,3 +1,9 @@ +# -*- coding: utf-8 -*- + +from __future__ import (absolute_import, division, + print_function, unicode_literals) +from builtins import * + from django.shortcuts import render, get_object_or_404, redirect from django.core.exceptions import PermissionDenied, ValidationError from django.core.cache import cache From 9b5aeee83e06e106f7645f8867e570b15ba9410c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Thu, 1 Sep 2016 00:52:34 +0200 Subject: [PATCH 2/3] Oubli compat Py2 req --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/requirements.txt b/requirements.txt index 5edd6f00..d06c1123 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,3 +16,5 @@ asgiref==0.14.0 daphne==0.14.3 asgi-redis==0.14.0 -e git+https://github.com/Aureplop/channels.git#egg=channel +statistics==1.0.3.5 +future==0.15.2 From 94989b0ad2f7d1254c3703f4656a9c850cbe493a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Thu, 1 Sep 2016 01:02:15 +0200 Subject: [PATCH 3/3] Oubli compat Py2 req (encore) --- kfet/models.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kfet/models.py b/kfet/models.py index c59be9e3..dd7001dc 100644 --- a/kfet/models.py +++ b/kfet/models.py @@ -12,6 +12,7 @@ from django.contrib.auth.models import User from gestioncof.models import CofProfile from django.utils.six.moves import reduce from django.utils import timezone +from django.utils.encoding import python_2_unicode_compatible from django.db import transaction from django.db.models import F from django.core.cache import cache @@ -25,6 +26,7 @@ def default_promo(): now = date.today() return now.month <= 8 and now.year-1 or now.year +@python_2_unicode_compatible class Account(models.Model): cofprofile = models.OneToOneField( CofProfile, on_delete = models.PROTECT, @@ -223,6 +225,7 @@ class AccountNegative(models.Model): blank = True, null = True, default = None) comment = models.CharField(max_length = 255, blank = True) +@python_2_unicode_compatible class Checkout(models.Model): created_by = models.ForeignKey( Account, on_delete = models.PROTECT, @@ -254,6 +257,7 @@ class CheckoutTransfer(models.Model): amount = models.DecimalField( max_digits = 6, decimal_places = 2) +@python_2_unicode_compatible class CheckoutStatement(models.Model): by = models.ForeignKey( Account, on_delete = models.PROTECT, @@ -315,12 +319,14 @@ class CheckoutStatement(models.Model): balance=F('balance') - last_statement.balance_new + self.balance_new) super(CheckoutStatement, self).save(*args, **kwargs) +@python_2_unicode_compatible class ArticleCategory(models.Model): name = models.CharField(max_length = 45) def __str__(self): return self.name +@python_2_unicode_compatible class Article(models.Model): name = models.CharField(max_length = 45) is_sold = models.BooleanField(default = True) @@ -393,6 +399,7 @@ class InventoryArticle(models.Model): self.stock_error = self.stock_new - self.stock_old super(InventoryArticle, self).save(*args, **kwargs) +@python_2_unicode_compatible class Supplier(models.Model): articles = models.ManyToManyField( Article,