Browse Source

[trac800] fix a few typos

Jelte Jansen 13 years ago
parent
commit
12186e267f
2 changed files with 8 additions and 6 deletions
  1. 1 1
      src/bin/bind10/bind10_messages.mes
  2. 7 5
      src/bin/bind10/sockcreator.py

+ 1 - 1
src/bin/bind10/bind10_messages.mes

@@ -171,7 +171,7 @@ It probably crashed.
 
 
 % BIND10_SOCKCREATOR_BAD_RESPONSE unknown response for socket request: %1
 % BIND10_SOCKCREATOR_BAD_RESPONSE unknown response for socket request: %1
 The boss requested a socket from the creator, but the answer is unknown. This
 The boss requested a socket from the creator, but the answer is unknown. This
-looks like programmer error.
+looks like a programmer error.
 
 
 % BIND10_SOCKET_ERROR error on %1 call in the creator: %2/%3
 % BIND10_SOCKET_ERROR error on %1 call in the creator: %2/%3
 The socket creator failed to create the requested socket. It failed on the
 The socket creator failed to create the requested socket. It failed on the

+ 7 - 5
src/bin/bind10/sockcreator.py

@@ -23,7 +23,7 @@ from libutil_io_python import recv_fd
 logger = isc.log.Logger("boss")
 logger = isc.log.Logger("boss")
 
 
 """
 """
-Module that comunicates with the priviledget socket creator (b10-sockcreator).
+Module that comunicates with the privileged socket creator (b10-sockcreator).
 """
 """
 
 
 class CreatorError(Exception):
 class CreatorError(Exception):
@@ -54,7 +54,7 @@ class Parser:
 
 
     In theory, anything here can throw a fatal CreatorError exception, but it
     In theory, anything here can throw a fatal CreatorError exception, but it
     happens only in case something like the creator process crashes. Any other
     happens only in case something like the creator process crashes. Any other
-    occations are mentioned explicitly.
+    occasions are mentioned explicitly.
     """
     """
 
 
     def __init__(self, creator_socket):
     def __init__(self, creator_socket):
@@ -73,7 +73,9 @@ class Parser:
     def terminate(self):
     def terminate(self):
         """
         """
         Asks the creator process to terminate and waits for it to close the
         Asks the creator process to terminate and waits for it to close the
-        socket. Does not return anything.
+        socket. Does not return anything. Raises a CreatorError if there is
+        still data on the socket, if there is an error closing the socket,
+        or if the socket had already been closed.
         """
         """
         if self.__socket is None:
         if self.__socket is None:
             raise CreatorError('Terminated already', True)
             raise CreatorError('Terminated already', True)
@@ -160,7 +162,7 @@ class Parser:
         """
         """
         Keeps reading until length data is read or EOF or error happens.
         Keeps reading until length data is read or EOF or error happens.
 
 
-        EOF is considered error as well and throws.
+        EOF is considered error as well and throws a CreatorError.
         """
         """
         result = b''
         result = b''
         while len(result) < length:
         while len(result) < length:
@@ -175,7 +177,7 @@ class Parser:
 class WrappedSocket:
 class WrappedSocket:
     """
     """
     This class wraps a socket and adds a read_fd method, so it can be used
     This class wraps a socket and adds a read_fd method, so it can be used
-    for the Parser class conveniently. It simply copies all it's guts into
+    for the Parser class conveniently. It simply copies all its guts into
     itself and implements the method.
     itself and implements the method.
     """
     """
     def __init__(self, socket):
     def __init__(self, socket):