From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 27 Jul 2015 11:38:06 +0000 (+0200)
Subject: Merge branch 'pr/136'
X-Git-Tag: dev-2a51c9b95d06~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be0e0458f48bc8b7d6e634643079082671281aee;p=thirdparty%2Fbabel.git

Merge branch 'pr/136'
---

be0e0458f48bc8b7d6e634643079082671281aee
diff --cc tests/test_dates.py
index 25719299,43603937..1f6e7e7d
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@@ -189,9 -189,9 +189,9 @@@ class DateTimeFormatTestCase(unittest.T
  
      def test_timezone_name(self):
          tz = timezone('Europe/Paris')
 -        dt = datetime(2007, 4, 1, 15, 30, tzinfo=tz)
 +        dt = tz.localize(datetime(2007, 4, 1, 15, 30))
          fmt = dates.DateTimeFormat(dt, locale='fr_FR')
-         self.assertEqual('Heure : France', fmt['v'])
+         self.assertEqual('heure : France', fmt['v'])
  
      def test_timezone_location_format(self):
          tz = timezone('Europe/Paris')