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

[Sidnei da Silva]

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

Modified Files:
	NZOMigrate.py 
Log Message:
Some typoes.

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.17 => 1.18 ===
                     setattr(new, str(value), [])
             else:
                 try:
-                    __traceback_info__ = ('copyProperties/getProperty(new)', prop)
+                    __traceback_info__ = ('copyProperties/getProperty(new)', \
+                                          prop)
                     value = orig.getProperty(prop)
                 except:
                     log(pretty_exc(sys.exc_info()))
                     value = ''
-            try:
-                __traceback_info__ = ('copyProperties/setProperty(new)', prop, value, type)
-                new._setProperty(prop, value, type)
-            except:
-                log(pretty_exc(sys.exc_info()))
+                try:
+                    __traceback_info__ = ('copyProperties/setProperty(new)', \
+                                          prop, value, type)
+                    new._setProperty(prop, value, type)
+                except:
+                    log(pretty_exc(sys.exc_info()))
         else:
             try:
-                __traceback_info__ = ('copyProperties/getProperty(existing)', prop)
+                __traceback_info__ = ('copyProperties/getProperty(existing)',
+                                      prop)
                 value = orig.getProperty(prop)
             except:
                 log(pretty_exc(sys.exc_info()))
                 value = ''
             try:
-                __traceback_info__ = ('copyProperties/setProperty(existing)', prop, value)
+                __traceback_info__ = ('copyProperties/setProperty(existing)', \
+                                      prop, value)
                 new._setPropValue(prop, value)
             except:
                 log(pretty_exc(sys.exc_info()))
@@ -579,11 +583,11 @@
         for id in ['case_facts', 'problem', 'solution', 'summary', \
                    'external_url', 'title']:
             values[id] = ''
-            prop = getattr(src, id, None)
+            prop = getattr(source, id, None)
             if prop is not None:
                 if callable(prop):
                     try:
-                        values[id] = prop(src)
+                        values[id] = prop(source)
                     except:
                         try:
                             values[id] = prop.raw()
@@ -597,7 +601,7 @@
         new_obj.setSolution('text/html', values['solution'])
         new_obj.setExternalURL(values['external_url'])
         new_obj.setTitle(values['title'])
-        if hasattr(aq_base(src), 'logo'):
+        if hasattr(aq_base(source), 'logo'):
             new_obj.setLogo('logo')
         return (new_obj, dest)
 
@@ -1059,6 +1063,8 @@
                     if res != []:
                         self.log('\n'.join(res) + '\n')
                     
+                    massPublish(new_obj)
+                    updateRoleMappings(new_obj)
                     
                     if hasattr(obj, 'objectIds') and new_obj is not None:
                         ignore = WikiMethodsCleanup(obj, obj_url, ignore)
@@ -1071,9 +1077,6 @@
                         if source_id == 'Members':
                             res = recursiveOwnerFix(new_obj, oid, 1)
                             setLocalRoles(new_obj, (oid, ), 'Owner', obj_url)
-
-                    massPublish(new_obj)
-                    updateRoleMappings(new_obj)
 
                     new_obj = fixModificationDate(obj, new_obj)