[svn] commit: r3544 - in /branches/trac411: ./ src/lib/python/isc/datasrc/ src/lib/python/isc/datasrc/tests/

[BIND 10 source code commits]

Author: jinmei
Date: Tue Nov 16 16:09:49 2010
New Revision: 3544

Log:
don't recongnize a trailing garbage as part of TTL spec.
this fix will prevent the parser from regarding a name beginning with a number as TTL (unless the name is really indistinguishable from a valid TTL).

Added:
    branches/trac411/src/lib/python/isc/datasrc/tests/
    branches/trac411/src/lib/python/isc/datasrc/tests/Makefile.am
    branches/trac411/src/lib/python/isc/datasrc/tests/master_test.py
Modified:
    branches/trac411/configure.ac
    branches/trac411/src/lib/python/isc/datasrc/Makefile.am
    branches/trac411/src/lib/python/isc/datasrc/master.py

Modified: branches/trac411/configure.ac
==============================================================================
--- branches/trac411/configure.ac (original)
+++ branches/trac411/configure.ac Tue Nov 16 16:09:49 2010
@@ -493,6 +493,7 @@
                  src/lib/python/isc/util/Makefile
                  src/lib/python/isc/util/tests/Makefile
                  src/lib/python/isc/datasrc/Makefile
+                 src/lib/python/isc/datasrc/tests/Makefile
                  src/lib/python/isc/cc/Makefile
                  src/lib/python/isc/cc/tests/Makefile
                  src/lib/python/isc/config/Makefile

Modified: branches/trac411/src/lib/python/isc/datasrc/Makefile.am
==============================================================================
--- branches/trac411/src/lib/python/isc/datasrc/Makefile.am (original)
+++ branches/trac411/src/lib/python/isc/datasrc/Makefile.am Tue Nov 16 16:09:49 2010
@@ -1,3 +1,5 @@
+SUBDIRS = . tests
+
 python_PYTHON = __init__.py master.py sqlite3_ds.py
 
 pythondir = $(pyexecdir)/isc/datasrc

Modified: branches/trac411/src/lib/python/isc/datasrc/master.py
==============================================================================
--- branches/trac411/src/lib/python/isc/datasrc/master.py (original)
+++ branches/trac411/src/lib/python/isc/datasrc/master.py Tue Nov 16 16:09:49 2010
@@ -103,7 +103,7 @@
 # isttl: check whether a string is a valid TTL specifier.
 # returns: boolean
 #########################################################################
-ttl_regex = re.compile('([0-9]+[wdhms]?)+', re.I)
+ttl_regex = re.compile('([0-9]+[wdhms]?)+$', re.I)
 def isttl(s):
     global ttl_regex
     if ttl_regex.match(s):