]> git.ipfire.org Git - thirdparty/babel.git/commitdiff
Merge pull request #355 from lukas-b/lukas_add_pre_commit_and_apply_fixes
authorAarni Koskela <akx@iki.fi>
Thu, 3 Mar 2016 20:14:25 +0000 (22:14 +0200)
committerAarni Koskela <akx@iki.fi>
Thu, 3 Mar 2016 20:14:25 +0000 (22:14 +0200)
Add pre-commit and apply fixes

1  2 
babel/dates.py
babel/localedata.py
tests/test_dates.py

diff --cc babel/dates.py
Simple merge
Simple merge
index ee73d9db94b2214674c604f41a3339108502c44e,069c9bd189e143ede8a596179f714d1e5ae3e8cc..ca1faf0a94c1f14c3ec712f6dd6af0fdb994d15c
@@@ -127,81 -122,43 +127,81 @@@ class DateTimeFormatTestCase(unittest.T
          self.assertEqual('5', fmt['F'])
  
      def test_local_day_of_week(self):
-         d = date(2007, 4, 1) # a sunday
+         d = date(2007, 4, 1)  # a sunday
          fmt = dates.DateTimeFormat(d, locale='de_DE')
-         self.assertEqual('7', fmt['e']) # monday is first day of week
+         self.assertEqual('7', fmt['e'])  # monday is first day of week
          fmt = dates.DateTimeFormat(d, locale='en_US')
-         self.assertEqual('01', fmt['ee']) # sunday is first day of week
+         self.assertEqual('01', fmt['ee'])  # sunday is first day of week
          fmt = dates.DateTimeFormat(d, locale='bn_BD')
-         self.assertEqual('03', fmt['ee']) # friday is first day of week
+         self.assertEqual('03', fmt['ee'])  # friday is first day of week
  
-         d = date(2007, 4, 2) # a monday
+         d = date(2007, 4, 2)  # a monday
          fmt = dates.DateTimeFormat(d, locale='de_DE')
-         self.assertEqual('1', fmt['e']) # monday is first day of week
+         self.assertEqual('1', fmt['e'])  # monday is first day of week
          fmt = dates.DateTimeFormat(d, locale='en_US')
-         self.assertEqual('02', fmt['ee']) # sunday is first day of week
+         self.assertEqual('02', fmt['ee'])  # sunday is first day of week
          fmt = dates.DateTimeFormat(d, locale='bn_BD')
-         self.assertEqual('04', fmt['ee']) # friday is first day of week
+         self.assertEqual('04', fmt['ee'])  # friday is first day of week
  
      def test_local_day_of_week_standalone(self):
-         d = date(2007, 4, 1) # a sunday
+         d = date(2007, 4, 1)  # a sunday
          fmt = dates.DateTimeFormat(d, locale='de_DE')
-         self.assertEqual('7', fmt['c']) # monday is first day of week
+         self.assertEqual('7', fmt['c'])  # monday is first day of week
          fmt = dates.DateTimeFormat(d, locale='en_US')
-         self.assertEqual('1', fmt['c']) # sunday is first day of week
+         self.assertEqual('1', fmt['c'])  # sunday is first day of week
          fmt = dates.DateTimeFormat(d, locale='bn_BD')
-         self.assertEqual('3', fmt['c']) # friday is first day of week
+         self.assertEqual('3', fmt['c'])  # friday is first day of week
  
-         d = date(2007, 4, 2) # a monday
+         d = date(2007, 4, 2)  # a monday
          fmt = dates.DateTimeFormat(d, locale='de_DE')
-         self.assertEqual('1', fmt['c']) # monday is first day of week
+         self.assertEqual('1', fmt['c'])  # monday is first day of week
          fmt = dates.DateTimeFormat(d, locale='en_US')
-         self.assertEqual('2', fmt['c']) # sunday is first day of week
+         self.assertEqual('2', fmt['c'])  # sunday is first day of week
          fmt = dates.DateTimeFormat(d, locale='bn_BD')
-         self.assertEqual('4', fmt['c']) # friday is first day of week
+         self.assertEqual('4', fmt['c'])  # friday is first day of week
  
 +    def test_pattern_day_of_week(self):
 +        dt = datetime(2016,2,6)
 +        fmt = dates.DateTimeFormat(dt, locale='en_US')
 +        self.assertEqual('7', fmt['c'])
 +        self.assertEqual('Sat', fmt['ccc'])
 +        self.assertEqual('Saturday', fmt['cccc'])
 +        self.assertEqual('S', fmt['ccccc'])
 +        self.assertEqual('Sa', fmt['cccccc'])
 +        self.assertEqual('7', fmt['e'])
 +        self.assertEqual('07', fmt['ee'])
 +        self.assertEqual('Sat', fmt['eee'])
 +        self.assertEqual('Saturday', fmt['eeee'])
 +        self.assertEqual('S', fmt['eeeee'])
 +        self.assertEqual('Sa', fmt['eeeeee'])
 +        self.assertEqual('Sat', fmt['E'])
 +        self.assertEqual('Sat', fmt['EE'])
 +        self.assertEqual('Sat', fmt['EEE'])
 +        self.assertEqual('Saturday', fmt['EEEE'])
 +        self.assertEqual('S', fmt['EEEEE'])
 +        self.assertEqual('Sa', fmt['EEEEEE'])
 +        fmt = dates.DateTimeFormat(dt, locale='uk')
 +        self.assertEqual('6', fmt['c'])
 +        self.assertEqual('6', fmt['e'])
 +        self.assertEqual('06', fmt['ee'])
 +
 +
      def test_fractional_seconds(self):
 -        t = time(15, 30, 12, 34567)
 +        t = time(8, 3, 9, 799)
 +        fmt = dates.DateTimeFormat(t, locale='en_US')
 +        self.assertEqual('0', fmt['S'])
 +        t = time(8, 3, 1, 799)
 +        fmt = dates.DateTimeFormat(t, locale='en_US')
 +        self.assertEqual('0008', fmt['SSSS'])
 +        t = time(8, 3, 1, 34567)
 +        fmt = dates.DateTimeFormat(t, locale='en_US')
 +        self.assertEqual('0346', fmt['SSSS'])
 +        t = time(8, 3, 1, 345678)
 +        fmt = dates.DateTimeFormat(t, locale='en_US')
 +        self.assertEqual('345678', fmt['SSSSSS'])
 +        t = time(8, 3, 1, 799)
          fmt = dates.DateTimeFormat(t, locale='en_US')
 -        self.assertEqual('3457', fmt['SSSS'])
 +        self.assertEqual('00080', fmt['SSSSS'])
  
      def test_fractional_seconds_zero(self):
          t = time(15, 30, 0)