Merge pull request #162 from 5j9/dirctive-pat

strptime: define some new directive patterns

Author: slashmili

jdatetime/__init__.py

@@ -611,12 +611,16 @@ def aslocale(self, locale):
 date.max = date(MAXYEAR, 12, 30)
 
 _DIRECTIVE_PATTERNS = {
+    '%A': '(?:' + '|'.join([*date.j_weekdays_fa, *date.j_weekdays_en]) + ')',
+    '%a': '(?:' + '|'.join([*date.j_weekdays_fa, *date.j_weekdays_short_en]) + ')',
     '%Y': r'(?P<Y>\d{4})',
     '%y': r'(?P<y>\d{2})',
     '%m': r'(?P<m>\d{1,2})',
     '%d': r'(?P<d>\d{1,2})',
     '%H': r'(?P<H>\d{1,2})',
+    '%j': r'[0-3]\d\d',
     '%M': r'(?P<M>\d{1,2})',
+    '%p': '(?:' + '|'.join([*date.j_ampm_fa.values(), *date.j_ampm_en.values()]) + ')',
     '%S': r'(?P<S>\d{1,2})',
     '%f': r'(?P<f>\d{1,6})',
     '%B': r'(?P<B>[a-zA-Z\u0600-\u06EF\uFB8A\u067E\u0686\u06AF]{2,12})',

tests/test_jdatetime.py

@@ -436,6 +436,14 @@ def test_strptime_invalid_date_string_z_directive(self):
                 with self.assertRaises(ValueError, msg=msg):
                     jdatetime.datetime.strptime(date_string, date_format)
 
+    def test_strptime_A_p_j_directives(self):
+        dt = jdatetime.datetime(1401, 2, 3, 4)
+        fmt = '%Y %m %d %H %j %p %A %a'
+        self.assertEqual(
+            jdatetime.datetime.strptime(dt.strftime(fmt), fmt),
+            dt,
+        )
+
     def test_timetz(self):
         teh = TehranTime()