[svn] commit: r3232 - in /branches/trac353/src: bin/bind10/ bin/cmdctl/ bin/xfrin/ lib/python/isc/net/ lib/python/isc/net/tests/

BIND 10 source code commits bind10-changes at lists.isc.org
Fri Oct 15 16:00:41 UTC 2010


Author: vorner
Date: Fri Oct 15 16:00:41 2010
New Revision: 3232

Log:
Rename _check to _parse

Since it didn't just check, it returned the object in some way.

Added:
    branches/trac353/src/lib/python/isc/net/parse.py
      - copied, changed from r3087, branches/trac353/src/lib/python/isc/net/check.py
    branches/trac353/src/lib/python/isc/net/tests/parse_test.py
      - copied, changed from r3087, branches/trac353/src/lib/python/isc/net/tests/check_test.py
Removed:
    branches/trac353/src/lib/python/isc/net/check.py
    branches/trac353/src/lib/python/isc/net/tests/check_test.py
Modified:
    branches/trac353/src/bin/bind10/bind10.py.in
    branches/trac353/src/bin/cmdctl/cmdctl.py.in
    branches/trac353/src/bin/xfrin/xfrin.py.in
    branches/trac353/src/lib/python/isc/net/Makefile.am
    branches/trac353/src/lib/python/isc/net/tests/Makefile.am

Modified: branches/trac353/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac353/src/bin/bind10/bind10.py.in (original)
+++ branches/trac353/src/bin/bind10/bind10.py.in Fri Oct 15 16:00:41 2010
@@ -63,7 +63,7 @@
 import posix
 
 import isc.cc
-import isc.net.check
+import isc.net.parse
 import isc.utils.process
 
 # Assign this process some longer name
@@ -582,7 +582,7 @@
     a valid port number. Used by OptionParser() on startup."""
     try:
         if opt_str in ['-p', '--port']:
-            parser.values.auth_port = isc.net.check.port_check(value)
+            parser.values.auth_port = isc.net.parse.port_parse(value)
         else:
             raise OptionValueError("Unknown option " + opt_str)
     except ValueError as e:
@@ -593,7 +593,7 @@
     a valid address. Used by OptionParser() on startup."""
     try:
         if opt_str in ['-a', '--address']:
-            parser.values.address = isc.net.check.addr_check(value)
+            parser.values.address = isc.net.parse.addr_parse(value)
         else:
             raise OptionValueError("Unknown option " + opt_str)
     except ValueError:

Modified: branches/trac353/src/bin/cmdctl/cmdctl.py.in
==============================================================================
--- branches/trac353/src/bin/cmdctl/cmdctl.py.in (original)
+++ branches/trac353/src/bin/cmdctl/cmdctl.py.in Fri Oct 15 16:00:41 2010
@@ -42,7 +42,7 @@
 import time
 import signal
 from isc.config import ccsession
-import isc.net.check
+import isc.net.parse
 import isc.utils.process
 from optparse import OptionParser, OptionValueError
 from hashlib import sha1
@@ -566,13 +566,13 @@
 
 def check_port(option, opt_str, value, parser):
     try:
-        parser.values.port = isc.net.check.port_check(value)
+        parser.values.port = isc.net.parse.port_parse(value)
     except ValueError as e:
         raise OptionValueError(str(e))
 
 def check_addr(option, opt_str, value, parser):
     try:
-        isc.net.check.addr_check(value)
+        isc.net.parse.addr_parse(value)
         parser.values.addr = value
     except ValueError as e:
         raise OptionValueError(str(e))

Modified: branches/trac353/src/bin/xfrin/xfrin.py.in
==============================================================================
--- branches/trac353/src/bin/xfrin/xfrin.py.in (original)
+++ branches/trac353/src/bin/xfrin/xfrin.py.in Fri Oct 15 16:00:41 2010
@@ -29,7 +29,7 @@
 from optparse import OptionParser, OptionValueError
 from isc.config.ccsession import *
 from isc.notify import notify_out
-import isc.net.check
+import isc.net.parse
 import isc.utils.process
 try:
     from pydnspp import *
@@ -402,13 +402,12 @@
     def config_handler(self, new_config):
         self._max_transfers_in = new_config.get("transfers_in") or self._max_transfers_in
         if ('master_addr' in new_config) or ('master_port' in new_config):
-            # Check if the new master is valid, there should be library for check it.
-            # and user should change the port and address together.
+            # User should change the port and address together.
             try:
                 addr = new_config.get('master_addr') or self._master_addr
                 port = new_config.get('master_port') or self._master_port
-                isc.net.check.addr_check(addr)
-                isc.net.check.port_check(port)
+                isc.net.parse.addr_parse(addr)
+                isc.net.parse.port_parse(port)
                 self._master_addr = addr
                 self._master_port = port
             except ValueError:
@@ -568,8 +567,8 @@
     (address, port). The socktype is socket.SOCK_STREAM for now.
     """
     try:
-        port = isc.net.check.port_check(portstr)
-        addr = isc.net.check.addr_check(addrstr)
+        port = isc.net.parse.port_parse(portstr)
+        addr = isc.net.parse.addr_parse(addrstr)
         return (addr.family, socket.SOCK_STREAM, (addrstr, port))
     except ValueError as err:
         raise XfrinException("failed to resolve master address/port=%s/%s: %s" %

Modified: branches/trac353/src/lib/python/isc/net/Makefile.am
==============================================================================
--- branches/trac353/src/lib/python/isc/net/Makefile.am (original)
+++ branches/trac353/src/lib/python/isc/net/Makefile.am Fri Oct 15 16:00:41 2010
@@ -1,5 +1,5 @@
 SUBDIRS = tests
 
-python_PYTHON = __init__.py addr.py check.py
+python_PYTHON = __init__.py addr.py parse.py
 
 pythondir = $(pyexecdir)/isc/net

Modified: branches/trac353/src/lib/python/isc/net/tests/Makefile.am
==============================================================================
--- branches/trac353/src/lib/python/isc/net/tests/Makefile.am (original)
+++ branches/trac353/src/lib/python/isc/net/tests/Makefile.am Fri Oct 15 16:00:41 2010
@@ -1,4 +1,4 @@
-PYTESTS = addr_test.py check_test.py
+PYTESTS = addr_test.py parse_test.py
 EXTRA_DIST = $(PYTESTS)
 
 # later will have configure option to choose this, like: coverage run --branch




More information about the bind10-changes mailing list