From 4c0600a4f54616461be7b8b464a5a304ee998d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 1 Sep 2018 01:02:03 +0200
Subject: [PATCH] Improve ModelStorage.copy

* Allow callable in copy default
* Support dotted notation in copy default
* Use setdefault in copy
* Copy default when needed
* Do not set default state in copy
* Use callable and dotted notation in copy default

issue5576
issue7648
review72291002
---
 payment.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/payment.py b/payment.py
index 8b1e7036b8..624207600c 100644
--- a/payment.py
+++ b/payment.py
@@ -324,13 +324,13 @@ class Payment(metaclass=PoolMeta):
             default = {}
         else:
             default = default.copy()
-        default['stripe_checkout_id'] = None
-        default['stripe_charge_id'] = None
-        default['stripe_token'] = None
-        default.setdefault('stripe_idempotency_key')
-        default.setdefault('stripe_error_message')
-        default.setdefault('stripe_error_code')
-        default.setdefault('stripe_error_param')
+        default.setdefault('stripe_checkout_id', None)
+        default.setdefault('stripe_charge_id', None)
+        default.setdefault('stripe_token', None)
+        default.setdefault('stripe_idempotency_key', None)
+        default.setdefault('stripe_error_message', None)
+        default.setdefault('stripe_error_code', None)
+        default.setdefault('stripe_error_param', None)
         return super(Payment, cls).copy(payments, default=default)
 
     @classmethod
@@ -774,9 +774,9 @@ class Customer(DeactivableMixin, ModelSQL, ModelView):
             default = {}
         else:
             default = default.copy()
-        default['stripe_checkout_id'] = None
-        default['stripe_token'] = None
-        default['stripe_customer_id'] = None
+        default.setdefault('stripe_checkout_id', None)
+        default.setdefault('stripe_token', None)
+        default.setdefault('stripe_customer_id', None)
         return super(Customer, cls).copy(customers, default=default)
 
     @classmethod