[Collective-checkins] CMFMember Member.py,1.1.2.15,1.1.2.16

[Sasha V. <sv...@us...>]

Update of /cvsroot/collective/CMFMember
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17944

Modified Files:
      Tag: BRC_branch
	Member.py 
Log Message:
Fixed some broken migration when there was users in portal_memberdata :) and changed the logging in migration.

Index: Member.py
===================================================================
RCS file: /cvsroot/collective/CMFMember/Attic/Member.py,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- Member.py	24 Feb 2004 23:47:41 -0000	1.1.2.15
+++ Member.py	28 Feb 2004 20:00:54 -0000	1.1.2.16
@@ -1362,9 +1362,9 @@
                     try:
                         value = properties.get(name)
                         self._migrateSetNewValue(name, value, out)
-                        print >> out, '%s.%s = %s' % (old_member['user'].getUserName(), name, str(value))
+                        out.append('%s.%s = %s' % (old_member['user'].getUserName(), name, str(value)))
                     except:
-                        print >> out, 'Unable to get field %s from member %s' % (name, old_member['user'].getUserName())
+                        out.append('Unable to get field %s from member %s' % (name, old_member['user'].getUserName()))
                 self.setId(old_member['user'].getUserName())
 
             self.portrait = old_member['portrait']
@@ -1380,15 +1380,14 @@
                     try:
                         value = self._migrateGetOldValue(old_member, name, out)
                         self._migrateSetNewValue(name, value, out)
-                        print >> out, '%s.%s = %s' % (str(old_member.getMemberId()), name, str(value))
+                        out.append('%s.%s = %s' % (str(old_member.getMemberId()), name, str(value)))
                     except:
-                        print >> out, 'Unable to get field %s from member %s' % (name, old_member.getUserName())
+                        out.append('Unable to get field %s from member %s' % (name, old_member.getUserName()))
                         pass
 
             # move the user over
             self.setUser(old_member.getUser())
 
-
     def _migrateGetOldValue(self, old, id, out):
         """Try to get a value from an old member object using a variety of
         methods."""
@@ -1415,7 +1414,7 @@
         if hasattr(old, id):
             return getattr(old, id)
         
-        print >> out, 'Unable to get property %s from member %s\n' % (new_field.name, old.getMemberId())
+        out.append('Unable to get property %s from member %s\n' % (new_field.name, old.getMemberId()))
         raise ValueError
     
         
@@ -1431,13 +1430,13 @@
             if hasattr(self, id):
                 setattr(self, id, value)
                 return
-            print >> out, 'Unable to set property %s from member %s\n' % (new_field.name, self.getMemberId())
+            out.append('Unable to set property %s from member %s\n' % (new_field.name, self.getMemberId()))
             raise ValueError
         else:
             if hasattr(self, id):
                 setattr(self, id, value)
                 return
-            print >> out, 'Unable to set property %s from member %s\n' % (id, self.getMemberId())
+            out.append('Unable to set property %s from member %s\n' % (id, self.getMemberId()))
             raise ValueError