[Zope3-checkins] CVS: Zope3/src/zope/i18n - format.py:1.5

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/i18n
In directory cvs.zope.org:/tmp/cvs-serv23365/src/zope/i18n

Modified Files:
	format.py 
Log Message:
Fixed some regex bugs. Definitely I need to write more tests for this.


=== Zope3/src/zope/i18n/format.py 1.4 => 1.5 ===
--- Zope3/src/zope/i18n/format.py:1.4	Tue Mar 25 09:48:01 2003
+++ Zope3/src/zope/i18n/format.py	Tue Mar 25 15:03:46 2003
@@ -441,7 +441,7 @@
         ('G', 1): r'(%s|%s)' %(calendar.eras[0], calendar.eras[1]),
         ('y', 2): r'([0-9]{2})',
         ('y', 4): r'([0-9]{4})',
-        ('M', 1): r'([0-9]{1, 2})',
+        ('M', 1): r'([0-9]{1,2})',
         ('M', 2): r'([0-9]{2})',
         ('M', 3): r'('+'|'.join(calendar.getMonthAbbr())+')',
         ('M', 4): r'('+'|'.join(calendar.getMonthNames())+')',
@@ -460,17 +460,17 @@
         ('H', 2): r'([0-9]{2})',
         ('m', 1): r'([0-9]{1,2})',
         ('m', 2): r'([0-9]{2})',
-        ('s', 1): r'([0-9]{1, 2})',
+        ('s', 1): r'([0-9]{1,2})',
         ('s', 2): r'([0-9]{2})',
-        ('S', 1): r'([0-9]{0, 6})',
+        ('S', 1): r'([0-9]{0,6})',
         ('S', 2): r'([0-9]{6})',
         ('F', 1): r'([0-9])',
-        ('F', 2): r'([0-9]{1, 2})',
+        ('F', 2): r'([0-9]{1,2})',
         ('W', 1): r'([0-9])',
         ('W', 2): r'([0-9]{2})',
-        ('k', 1): r'([0-9]{1, 2})',
+        ('k', 1): r'([0-9]{1,2})',
         ('k', 2): r'([0-9]{2})',
-        ('K', 1): r'([0-9]{1, 2})',
+        ('K', 1): r'([0-9]{1,2})',
         ('K', 2): r'([0-9]{2})',
         ('z', 1): r'([\+-][0-9]{3,4})',
         ('z', 2): r'([\+-][0-9]{2}:[0-9]{2})',