check_validator -> set_validator in ProtocolBase

plq · plq · commit ab9d613d8b04 · 2011-12-23T12:39:58.000+02:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,7 @@ Changelog
 rpclib-2.5.1-beta
 -----------------
  * Switched to magic cookie constants instead of strings in protocol logic.
+ * check_validator -> set_validator in ProtocolBase
 
 rpclib-2.5.0-beta
 -----------------
diff --git a/src/rpclib/protocol/_base.py b/src/rpclib/protocol/_base.py
@@ -36,6 +36,7 @@
 from rpclib.const.http import HTTP_404
 from rpclib.const.http import HTTP_413
 from rpclib.const.http import HTTP_500
+
 from rpclib.error import ResourceNotFoundError
 from rpclib.error import RequestTooLongError
 from rpclib.error import Fault
@@ -71,8 +72,7 @@ def __init__(self, app=None, validator=None):
 
         self.set_app(app)
         self.event_manager = EventManager(self)
-        self.validator = validator
-        self.check_validator()
+        self.set_validator(validator)
 
     @property
     def app(self):
@@ -179,8 +179,10 @@ def fault_to_http_response_code(self, fault):
         else:
             return HTTP_500
 
-    def check_validator(self):
+    def set_validator(self, validator):
         """You must override this function if your protocol supports validation.
         """
 
-        assert self.validator is None
+        assert validator is None
+
+        self.validator = None
diff --git a/src/rpclib/protocol/http.py b/src/rpclib/protocol/http.py
@@ -43,10 +43,11 @@ def _get_http_headers(req_env):
     return retval
 
 class HttpRpc(ProtocolBase):
-    """The so-called ReST-minus-the-verbs HttpRpc protocol implementation.
+    """The so-called REST-minus-the-verbs HttpRpc protocol implementation.
     It only works with the http server (wsgi) transport.
 
-    It only parses GET requests where the whole data is in the 'QUERY_STRING'.
+    It only parses requests where the whole data is in the 'QUERY_STRING', i.e.
+    the part after '?' character in a URI string.
     """
 
     def check_validator(self):
@@ -66,8 +67,8 @@ def decompose_incoming_envelope(self, ctx):
         ctx.in_header_doc = _get_http_headers(ctx.in_document)
         ctx.in_body_doc = parse_qs(ctx.in_document['QUERY_STRING'])
 
-        logger.debug('body   : %r' % (ctx.in_body_doc))
         logger.debug('header : %r' % (ctx.in_header_doc))
+        logger.debug('body   : %r' % (ctx.in_body_doc))
 
     def dict_to_object(self, doc, inst_class):
         flat_type_info = inst_class.get_flat_type_info(inst_class)
