[Checkins] SVN: zope.i18n/trunk/ Fix #611746: NAME_RE should be identical to the one in zope.tal

[Christian Theune]

Log message for revision 117901:
  Fix #611746: NAME_RE should be identical to the one in zope.tal
  

Changed:
  U   zope.i18n/trunk/CHANGES.txt
  U   zope.i18n/trunk/src/zope/i18n/__init__.py

-=-
Modified: zope.i18n/trunk/CHANGES.txt
===================================================================
--- zope.i18n/trunk/CHANGES.txt	2010-10-26 13:41:50 UTC (rev 117900)
+++ zope.i18n/trunk/CHANGES.txt	2010-10-26 13:54:41 UTC (rev 117901)
@@ -8,6 +8,8 @@
 - Include meta.zcml files in our own zcml configuration as needed, added a
   test for our configure.zcml.
 
+- Update zope.i18n.NAME_RE to be identical to zope.tal as required by the
+  comment next to it. Fixes #611746.
 
 3.7.4 (2010-07-08)
 ------------------

Modified: zope.i18n/trunk/src/zope/i18n/__init__.py
===================================================================
--- zope.i18n/trunk/src/zope/i18n/__init__.py	2010-10-26 13:41:50 UTC (rev 117900)
+++ zope.i18n/trunk/src/zope/i18n/__init__.py	2010-10-26 13:54:41 UTC (rev 117901)
@@ -26,7 +26,7 @@
 # Set up regular expressions for finding interpolation variables in text.
 # NAME_RE must exactly match the expression of the same name in the
 # zope.tal.taldefs module:
-NAME_RE = r"[a-zA-Z][-a-zA-Z0-9_]*"
+NAME_RE = r"[a-zA-Z_][-a-zA-Z0-9_]*"
 
 _interp_regex = re.compile(r'(?<!\$)(\$(?:(%(n)s)|{(%(n)s)}))'
     % ({'n': NAME_RE}))