[Python-checkins] CVS: python/dist/src/Modules _localemodule.c,2.25.6.1,2.25.6.2

[Michael Hudson]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv28509

Modified Files:
      Tag: release22-maint
	_localemodule.c 
Log Message:
backport loewis' checkin of
    revision 2.28 of _localemodule.c

Don't imply XPG4 constants from CODESET presence. Fixes #534153.
2.2.2 candiate.


Index: _localemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.25.6.1
retrieving revision 2.25.6.2
diff -C2 -d -r2.25.6.1 -r2.25.6.2
*** _localemodule.c	16 Mar 2002 17:54:20 -0000	2.25.6.1
--- _localemodule.c	5 Apr 2002 15:26:55 -0000	2.25.6.2
***************
*** 485,491 ****
      LANGINFO(PM_STR),
  
  #ifdef CODESET
-     /* The following constants are available only with XPG4. */
      LANGINFO(CODESET),
      LANGINFO(T_FMT_AMPM),
      LANGINFO(ERA),
--- 485,494 ----
      LANGINFO(PM_STR),
  
+     /* The following constants are available only with XPG4. AIX 3.2. only has
+        CODESET. */
  #ifdef CODESET
      LANGINFO(CODESET),
+ #endif
+ #ifdef T_FMT_AMPM
      LANGINFO(T_FMT_AMPM),
      LANGINFO(ERA),