Make getPassword default value behave consistently between cases where...

Make getPassword default value behave consistently between cases where password is of Persistent Mapping type and cases where it is not.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27638 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/Person.py

@@ -243,27 +243,23 @@ class Person(XMLObject):
           Default: 'default'
       """
       marker = []
-      password = getattr(aq_base(self), 'password', marker)
-      if password is marker:
       if len(args):
-          password = args[0]
+        default_password = args[0]
       else:
-          password = None
+        default_password = None
+      password = getattr(aq_base(self), 'password', marker)
+      if password is marker:
+        password = default_password
       else:
         format = kw.get('format', 'default')
         # Backward compatibility: if it's not a PersistentMapping instance,
         # assume it's a monovalued string, which corresponds to default
         # password encoding.
         if isinstance(password, PersistentMapping):
-          password = password.get(format, marker)
-          if password is marker:
-            if len(args):
-              password = args[0]
-            else:
-              password = None
+          password = password.get(format, default_password)
         else:
           if format != 'default':
-            password = None
+            password = default_password
       return password
 
     # Time management