[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.34

[Sidnei da Silva]

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv6146/Extensions

Modified Files:
	NZOMigrate.py 
Log Message:
Last updates on migration

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.33 => 1.34 ===
 from zExceptions.ExceptionFormatter import format_exception
 import zLOG
 
+from AccessControl import SpecialUsers
+
 def _send_update_notice(self, *args, **kw):
     pass
 
@@ -23,16 +25,11 @@
                    'SiteAnnouncement', 'WhatIsZope', 'ZopeArchitecture', 'ZopeNews', 'privacy.html',
                    'Members']
         migrate.sort()
-        migrate = migrate[migrate.index('Members'):]
         ignore_path = ['/%s' % o for o in source.objectIds() if o not in migrate]
     members_ignore = ['billqian', 'edward', 'epson', 'ltunes', 'michel', 'superuser', \
-                      'myUnreviewed', 'mail_password_form', \
+                      'ewilliams', 'myUnreviewed', 'mail_password_form', \
                       'mail_password_template', 'password_html', 'tim.kidder', 'update_html', \
                       'index_html']
-    mids = source.Members.objectIds()
-    mids.sort()
-    mids = mids[:mids.index('ewilliams')]
-    members_ignore.extend(mids)
     dont_migrate = ['/Members/%s' % o for o in members_ignore]
     ignore_path.extend(dont_migrate)
     if exceptions is None:
@@ -553,6 +550,12 @@
         owner = orig.getOwner()
     except:
         owner = None
+    if owner is None:
+        if '_owner' in new.__dict__.keys():
+            delattr(new, '_owner')
+            return new
+    if '__ac_local_roles__' in new.__dict__.keys():
+        delattr(new, '__ac_local_roles__')
     try:
         new.changeOwnership(owner)
     except: pass