forked from DGNum/gestioCOF
remove @py2_unicode_compat + six
This commit is contained in:
parent
97eed06b6f
commit
62d8c2ffaf
2 changed files with 3 additions and 6 deletions
|
@ -1,11 +1,11 @@
|
||||||
|
from functools import reduce
|
||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.core.validators import RegexValidator
|
from django.core.validators import RegexValidator
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from gestioncof.models import CofProfile
|
from gestioncof.models import CofProfile
|
||||||
from django.utils.six.moves import reduce
|
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.utils.encoding import python_2_unicode_compatible
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.db.models import F
|
from django.db.models import F
|
||||||
|
@ -370,7 +370,7 @@ class CheckoutTransfer(models.Model):
|
||||||
amount = models.DecimalField(
|
amount = models.DecimalField(
|
||||||
max_digits = 6, decimal_places = 2)
|
max_digits = 6, decimal_places = 2)
|
||||||
|
|
||||||
@python_2_unicode_compatible
|
|
||||||
class CheckoutStatement(models.Model):
|
class CheckoutStatement(models.Model):
|
||||||
by = models.ForeignKey(
|
by = models.ForeignKey(
|
||||||
Account, on_delete = models.PROTECT,
|
Account, on_delete = models.PROTECT,
|
||||||
|
@ -439,7 +439,6 @@ class CheckoutStatement(models.Model):
|
||||||
super(CheckoutStatement, self).save(*args, **kwargs)
|
super(CheckoutStatement, self).save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
@python_2_unicode_compatible
|
|
||||||
class ArticleCategory(models.Model):
|
class ArticleCategory(models.Model):
|
||||||
name = models.CharField("nom", max_length=45)
|
name = models.CharField("nom", max_length=45)
|
||||||
has_addcost = models.BooleanField("majorée", default=True,
|
has_addcost = models.BooleanField("majorée", default=True,
|
||||||
|
@ -452,7 +451,6 @@ class ArticleCategory(models.Model):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
|
||||||
@python_2_unicode_compatible
|
|
||||||
class Article(models.Model):
|
class Article(models.Model):
|
||||||
name = models.CharField("nom", max_length = 45)
|
name = models.CharField("nom", max_length = 45)
|
||||||
is_sold = models.BooleanField("en vente", default = True)
|
is_sold = models.BooleanField("en vente", default = True)
|
||||||
|
|
|
@ -9,7 +9,6 @@ django-recaptcha==1.0.5
|
||||||
django-redis-cache==1.7.1
|
django-redis-cache==1.7.1
|
||||||
psycopg2
|
psycopg2
|
||||||
Pillow==3.3.0
|
Pillow==3.3.0
|
||||||
six==1.10.0
|
|
||||||
unicodecsv==0.14.1
|
unicodecsv==0.14.1
|
||||||
icalendar==3.10
|
icalendar==3.10
|
||||||
django-bootstrap-form==3.2.1
|
django-bootstrap-form==3.2.1
|
||||||
|
|
Loading…
Reference in a new issue