[Checkins] SVN: Products.ExternalEditor/trunk/ Only use ExpandEnvironmentStrings on win32 systems. Found by Jens Klein.

[Wichert Akkerman]

Log message for revision 71558:
  Only use ExpandEnvironmentStrings on win32 systems. Found by Jens Klein.

Changed:
  U   Products.ExternalEditor/trunk/CHANGES.txt
  U   Products.ExternalEditor/trunk/zopeedit.py

-=-
Modified: Products.ExternalEditor/trunk/CHANGES.txt
===================================================================
--- Products.ExternalEditor/trunk/CHANGES.txt	2006-12-15 10:40:14 UTC (rev 71557)
+++ Products.ExternalEditor/trunk/CHANGES.txt	2006-12-15 11:19:41 UTC (rev 71558)
@@ -5,6 +5,8 @@
     - Fixed issue with 'manage_FTPget' overriding the 'Content-Type'
       header.
 
+    - Only run ExpandEnvironmentStrings on win32 systems.
+
   9/14/2006 - 0.9.2 Release
 
     - Added 'skip_data' option to make External Editor send out only

Modified: Products.ExternalEditor/trunk/zopeedit.py
===================================================================
--- Products.ExternalEditor/trunk/zopeedit.py	2006-12-15 10:40:14 UTC (rev 71557)
+++ Products.ExternalEditor/trunk/zopeedit.py	2006-12-15 11:19:41 UTC (rev 71558)
@@ -365,12 +365,15 @@
                 logger.debug('Found iexplore.exe. Skipping.')
                 editor = None
 
-        if editor is not None:            
-            return ExpandEnvironmentStrings(editor)
-        else:
+            if editor is not None:            
+                return ExpandEnvironmentStrings(editor)
+
+        if editor is None:
             fatalError('No editor was found for that object.\n'
                        'Specify an editor in the configuration file:\n'
                        '(%s)' % self.config.path)
+
+        return editor
         
     def launch(self):
         """Launch external editor"""