0002-family-fix-naive-datetime-warning-37760.patch

Benjamin Dauvergne, 25 novembre 2019 11:57

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/8] family: fix naive datetime warning (#37760)

 .../apps/family/loaders/concerto_orleans.py   |  8 ++---
 passerelle/apps/family/models.py              | 36 ++++++++++++-------
 2 files changed, 28 insertions(+), 16 deletions(-)

     from django.core.files.storage import DefaultStorage
     from ..models import Family, Adult, Child, Invoice
     from ..models import dict_cherry_pick, get_datetime
     from ..models import dict_cherry_pick, get_datetime, get_date
     def normalize_adult(adult):
-...
             'first_name': child['lib_prenom_per'],
             'last_name': child['lib_nom_per'],
             'sex': sex,
             'birthdate': get_datetime(child['dat_naissance'])
             'birthdate': get_date(child['dat_naissance'])
+        }
     def normalize_invoice(i):
-...
                 'total_amount': Decimal(i['mnt_facture_fac']),
                 'amount': Decimal(i['mnt_solde_fac']),
                 'issue_date': i['dat_generation_fac'],
                 'pay_limit_date': get_datetime(i['dat_limitepaie_fac']),
                 'pay_limit_date': get_date(i['dat_limitepaie_fac']),
                 'autobilling': i['on_prelevauto_ins'] == 'O',
                 'online_payment': True,
                 'payment_date': get_datetime(i['dat_reglement']),
                 'litigation_date': get_datetime(i['dat_perception_fac']),
                 'litigation_date': get_date(i['dat_perception_fac']),
                 'paid': Decimal(i['mnt_solde_fac']) == 0
+        }
         return invoice

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from datetime import date, time
     import json
     import os
     import shutil
-...
     from django.utils.translation import ugettext_lazy as _
     from django.http import Http404, HttpResponse
     from django.db import models, transaction
     from django.utils.timezone import make_aware, datetime, get_current_timezone, now
     from django.utils.timezone import make_aware, datetime, get_current_timezone, now, is_naive
     from passerelle.base.models import BaseResource
     from passerelle.utils.api import endpoint
-...
     DATE_FORMAT = '%Y-%m-%d'
     DATETIME_FORMAT = DATE_FORMAT + 'T%H:%M:%S'
     def get_date(dt):
         if isinstance(dt, date):
             return dt
         if not dt:
             return None
         return datetime.strptime(dt, DATE_FORMAT).date()
     def get_datetime(date):
         if not date:
             return None
         try:
             return make_aware(datetime.strptime(date,DATETIME_FORMAT),
                               get_current_timezone())
         except ValueError:
             pass
         try:
             return datetime.strptime(date, DATE_FORMAT).date()
         except ValueError:
             pass
         return None
         if not isinstance(date, datetime):
             try:
                 date = datetime.strptime(date, DATETIME_FORMAT)
             except ValueError:
                 date = datetime.strptime(date, DATE_FORMAT)
         if is_naive(date):
             date = make_aware(date)
         return date
     def format_address(data):
         address = '%(street_number)s, %(street_name)s' % data
-...
                     for date_attribute in data.keys():
                         if not date_attribute.endswith('_date'):
                             continue
                         data[date_attribute] = get_datetime(data[date_attribute])
                         if date_attribute == 'payment_date':
                             data[date_attribute] = get_datetime(data[date_attribute])
                         else:
                             data[date_attribute] = get_date(data[date_attribute])
                     data['paid'] = bool(data.get('payment_date'))
                     Invoice.objects.update_or_create(resource=self,
                             family=family, external_id=invoice['id'], defaults=data)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0002-family-fix-naive-datetime-warning-37760.patch