[Zope-Checkins] CVS: Zope/lib/python/OFS - ObjectManager.py:1.163

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv13794

Modified Files:
	ObjectManager.py 
Log Message:
minor cleanups


=== Zope/lib/python/OFS/ObjectManager.py 1.162 => 1.163 ===
--- Zope/lib/python/OFS/ObjectManager.py:1.162	Tue Feb 11 12:17:06 2003
+++ Zope/lib/python/OFS/ObjectManager.py	Tue Feb 11 16:06:28 2003
@@ -523,10 +523,7 @@
             raise BadRequestException, 'Invalid file name %s' % escape(file)
 
         cfg = getConfiguration()
-        instance_home = cfg.instancehome
-        zope_home = cfg.zopehome
-
-        for impath in (instance_home, zope_home):
+        for impath in (cfg.instancehome, cfg.zopehome):
             filepath = os.path.join(impath, 'import', file)
             if os.path.exists(filepath):
                 break
@@ -537,9 +534,10 @@
                                    set_owner=set_owner)
 
         if REQUEST is not None:
-            return self.manage_main(self, REQUEST,
+            return self.manage_main(
+                self, REQUEST,
                 manage_tabs_message='<em>%s</em> successfully imported' % id,
-                title = 'Object imported',
+                title='Object imported',
                 update_menu=1)
 
     def _importObjectFromFile(self, filepath, verify=1, set_owner=1):