[Python-checkins] r72402 - in python/branches/release30-maint: Lib/locale.py

[jeroen.ruigrok]

Author: jeroen.ruigrok
Date: Wed May  6 15:22:35 2009
New Revision: 72402

Log:
Merged revisions 72400 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72400 | jeroen.ruigrok | 2009-05-06 15:18:35 +0200 (wo, 06 mei 2009) | 11 lines
  
  Merged revisions 72399 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r72399 | jeroen.ruigrok | 2009-05-06 15:16:36 +0200 (wo, 06 mei 2009) | 4 lines
    
    Be more explicit about the error we are catching.
    
    Requested by: Antoine Pitrou
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/locale.py

Modified: python/branches/release30-maint/Lib/locale.py
==============================================================================
--- python/branches/release30-maint/Lib/locale.py	(original)
+++ python/branches/release30-maint/Lib/locale.py	Wed May  6 15:22:35 2009
@@ -559,7 +559,7 @@
                 oldloc = setlocale(LC_CTYPE)
                 try:
                     setlocale(LC_CTYPE, "")
-                except:
+                except Error:
                     pass
                 result = nl_langinfo(CODESET)
                 setlocale(LC_CTYPE, oldloc)