[Checkins] SVN: zope.app.applicationcontrol/trunk/ Extended the locale-specific fix for hosts which set 'LC_*' in the environment.

Tres Seaver tseaver at palladion.com
Tue Nov 1 14:04:39 UTC 2011


Log message for revision 123225:
  Extended the locale-specific fix for hosts which set 'LC_*' in the environment.
  
  Those variables shadow 'LANG'.
  

Changed:
  U   zope.app.applicationcontrol/trunk/CHANGES.txt
  U   zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/zopeversion.py

-=-
Modified: zope.app.applicationcontrol/trunk/CHANGES.txt
===================================================================
--- zope.app.applicationcontrol/trunk/CHANGES.txt	2011-11-01 01:00:19 UTC (rev 123224)
+++ zope.app.applicationcontrol/trunk/CHANGES.txt	2011-11-01 14:04:38 UTC (rev 123225)
@@ -5,8 +5,12 @@
 3.5.10 (unreleased)
 -------------------
 
+- Extended the locale-specific fix from version 3.5.6 for hosts
+  which set ``LC_*`` in the environment:  those variables shadow ``LANG``.
+
 - Replaced a testing dependency on zope.app.authentication with
   zope.password.
+
 - Removed unneeded zope.app.appsetup test dependency.
 
 

Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/zopeversion.py
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/zopeversion.py	2011-11-01 01:00:19 UTC (rev 123224)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/zopeversion.py	2011-11-01 14:04:38 UTC (rev 123225)
@@ -70,7 +70,7 @@
     def _getSVNInfoOutput(self):
         try:
             env = os.environ.copy()
-            env['LANG'] = 'C'
+            env['LANG'] = env['LC_ALL'] = env['LC_MESSAGES'] = 'C'
             proc = subprocess.Popen('svn info "%s"' % self.path,
                 shell=True, stdout=subprocess.PIPE, env=env)
         except OSError:



More information about the checkins mailing list