python-FormEncode-pycountry.patch

   1 --- FormEncode-1.3.1/formencode/national.py.orig        2016-08-08 13:33:45.000000000 +0200
   2 +++ FormEncode-1.3.1/formencode/national.py     2020-06-09 06:40:30.941129354 +0200
   3 @@ -85,19 +85,19 @@
   4      _l = lambda t: gettext.dgettext('iso639', t)
   5
   6      def get_countries():
   7 -        c1 = set([(e.alpha2, _c(e.name)) for e in pycountry.countries])
   8 +        c1 = set([(e.alpha_2, _c(e.name)) for e in pycountry.countries])
   9          ret = c1.union(country_additions + fuzzy_countrynames)
  10          return ret
  11
  12      def get_country(code):
  13 -        return _c(pycountry.countries.get(alpha2=code).name)
  14 +        return _c(pycountry.countries.get(alpha_2=code).name)
  15
  16      def get_languages():
  17 -        return [(e.alpha2, _l(e.name)) for e in pycountry.languages
  18 -            if e.name and getattr(e, 'alpha2', None)]
  19 +        return [(e.alpha_2, _l(e.name)) for e in pycountry.languages
  20 +            if e.name and getattr(e, 'alpha_2', None)]
  21
  22      def get_language(code):
  23 -        return _l(pycountry.languages.get(alpha2=code).name)
  24 +        return _l(pycountry.languages.get(alpha_2=code).name)
  25
  26
  27  ############################################################