[Python-checkins] CVS: python/dist/src/Lib gettext.py,1.8,1.9

[Barry Warsaw]

Update of /cvsroot/python/python/dist/src/Lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv934

Modified Files:
	gettext.py 
Log Message:
find(): Application of (slightly modified) SF patch #101928 by Ulf
Betlehem, verified by Peter Funk.  Fixes preservation of language
search order lost due to use of dictionary keys instead of a list.
Closes SF bug #116964.


Index: gettext.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/gettext.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** gettext.py	2000/10/05 18:48:12	1.8
--- gettext.py	2000/10/16 15:47:50	1.9
***************
*** 209,219 ****
              languages.append('C')
      # now normalize and expand the languages
!     langdict = {}
      for lang in languages:
          for nelang in _expand_lang(lang):
!             langdict[nelang] = nelang
!     languages = langdict.keys()
      # select a language
!     for lang in languages:
          if lang == 'C':
              break
--- 209,219 ----
              languages.append('C')
      # now normalize and expand the languages
!     nelangs = []
      for lang in languages:
          for nelang in _expand_lang(lang):
!             if nelang not in nelangs:
!                 nelangs.append(nelang)
      # select a language
!     for lang in nelangs:
          if lang == 'C':
              break