Mercurial > p > roundup > code
comparison roundup/date.py @ 3586:f47bddab5a49
date spec wasn't allowing week intervals
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Fri, 03 Mar 2006 02:02:50 +0000 |
| parents | 9c080e19f307 |
| children | 86d568dbab55 |
comparison
equal
deleted
inserted
replaced
| 3585:438adf66eb1a | 3586:f47bddab5a49 |
|---|---|
| 13 # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | 13 # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
| 14 # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" | 14 # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" |
| 15 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, | 15 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, |
| 16 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. | 16 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. |
| 17 # | 17 # |
| 18 # $Id: date.py,v 1.83 2006-01-13 00:22:16 richard Exp $ | 18 # $Id: date.py,v 1.84 2006-03-03 02:02:50 richard Exp $ |
| 19 | 19 |
| 20 """Date, time and time interval handling. | 20 """Date, time and time interval handling. |
| 21 """ | 21 """ |
| 22 __docformat__ = 'restructuredtext' | 22 __docformat__ = 'restructuredtext' |
| 23 | 23 |
| 44 date_re = re.compile(r'''^ | 44 date_re = re.compile(r'''^ |
| 45 ((?P<y>\d\d\d\d)([/-](?P<m>\d\d?)([/-](?P<d>\d\d?))?)? # yyyy[-mm[-dd]] | 45 ((?P<y>\d\d\d\d)([/-](?P<m>\d\d?)([/-](?P<d>\d\d?))?)? # yyyy[-mm[-dd]] |
| 46 |(?P<a>\d\d?)[/-](?P<b>\d\d?))? # or mm-dd | 46 |(?P<a>\d\d?)[/-](?P<b>\d\d?))? # or mm-dd |
| 47 (?P<n>\.)? # . | 47 (?P<n>\.)? # . |
| 48 (((?P<H>\d?\d):(?P<M>\d\d))?(:(?P<S>\d\d(\.\d+)?))?)? # hh:mm:ss | 48 (((?P<H>\d?\d):(?P<M>\d\d))?(:(?P<S>\d\d(\.\d+)?))?)? # hh:mm:ss |
| 49 (?P<o>[\d\smyd\-+]+)? # offset | 49 (?P<o>[\d\smywd\-+]+)? # offset |
| 50 $''', re.VERBOSE) | 50 $''', re.VERBOSE) |
| 51 serialised_date_re = re.compile(r''' | 51 serialised_date_re = re.compile(r''' |
| 52 (\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d?(\.\d+)?) | 52 (\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d?(\.\d+)?) |
| 53 ''', re.VERBOSE) | 53 ''', re.VERBOSE) |
| 54 | 54 |
