From f99d2cef608db4a5cd0e437f8ac6798e4756b6b9 Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Mon, 9 Jul 2018 20:35:25 +0200 Subject: [PATCH] Rend le aes_field disponible pour tout le monde et mon chibracounet facilement --- cotisations/migrations/0032_chequepayment_comnpaypayment.py | 4 ++-- cotisations/migrations/0034_auto_20180703_0929.py | 4 ++-- cotisations/payment_methods/comnpay/models.py | 2 +- preferences/migrations/0040_auto_20180129_1745.py | 2 +- {cotisations/payment_methods/comnpay => re2o}/aes_field.py | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename {cotisations/payment_methods/comnpay => re2o}/aes_field.py (100%) diff --git a/cotisations/migrations/0032_chequepayment_comnpaypayment.py b/cotisations/migrations/0032_chequepayment_comnpaypayment.py index 729b6f2e..9c3fab02 100644 --- a/cotisations/migrations/0032_chequepayment_comnpaypayment.py +++ b/cotisations/migrations/0032_chequepayment_comnpaypayment.py @@ -2,7 +2,7 @@ # Generated by Django 1.10.7 on 2018-07-02 18:56 from __future__ import unicode_literals -import cotisations.payment_methods.comnpay.aes_field +import re2o.aes_field import cotisations.payment_methods.mixins from django.db import migrations, models import django.db.models.deletion @@ -55,7 +55,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('payment_credential', models.CharField(blank=True, default='', max_length=255)), - ('payment_pass', cotisations.payment_methods.comnpay.aes_field.AESEncryptedField(blank=True, max_length=255, null=True)), + ('payment_pass', re2o.aes_field.AESEncryptedField(blank=True, max_length=255, null=True)), ('payment', models.OneToOneField(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='payment_method', to='cotisations.Paiement')), ], bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model), diff --git a/cotisations/migrations/0034_auto_20180703_0929.py b/cotisations/migrations/0034_auto_20180703_0929.py index 1e726cd1..aa3ca10f 100644 --- a/cotisations/migrations/0034_auto_20180703_0929.py +++ b/cotisations/migrations/0034_auto_20180703_0929.py @@ -2,7 +2,7 @@ # Generated by Django 1.10.7 on 2018-07-03 14:29 from __future__ import unicode_literals -import cotisations.payment_methods.comnpay.aes_field +import re2o.aes_field from django.db import migrations, models @@ -21,6 +21,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='comnpaypayment', name='payment_pass', - field=cotisations.payment_methods.comnpay.aes_field.AESEncryptedField(blank=True, max_length=255, null=True, verbose_name='ComNpay Secret Key'), + field=re2o.aes_field.AESEncryptedField(blank=True, max_length=255, null=True, verbose_name='ComNpay Secret Key'), ), ] diff --git a/cotisations/payment_methods/comnpay/models.py b/cotisations/payment_methods/comnpay/models.py index cbc93db1..d32e0a06 100644 --- a/cotisations/payment_methods/comnpay/models.py +++ b/cotisations/payment_methods/comnpay/models.py @@ -27,7 +27,7 @@ from django.utils.translation import ugettext_lazy as _l from cotisations.models import Paiement from cotisations.payment_methods.mixins import PaymentMethodMixin -from .aes_field import AESEncryptedField +from re2o.aes_field import AESEncryptedField from .comnpay import Transaction diff --git a/preferences/migrations/0040_auto_20180129_1745.py b/preferences/migrations/0040_auto_20180129_1745.py index 7b8248fd..7e657079 100644 --- a/preferences/migrations/0040_auto_20180129_1745.py +++ b/preferences/migrations/0040_auto_20180129_1745.py @@ -6,7 +6,7 @@ from django.db import migrations, models try: import preferences.aes_field as aes_field except ImportError: - import cotisations.payment_methods.comnpay.aes_field as aes_field + import re2o.aes_field as aes_field class Migration(migrations.Migration): diff --git a/cotisations/payment_methods/comnpay/aes_field.py b/re2o/aes_field.py similarity index 100% rename from cotisations/payment_methods/comnpay/aes_field.py rename to re2o/aes_field.py