Changeset 1440

Timestamp:

06/20/08 10:38:08 (7 months ago)

Author:

thijs

Message:

Cosmetic update

Location:

pyamf/trunk/pyamf/remoting

Files:

• __init__.py (modified) (1 diff)
• client/__init__.py (modified) (12 diffs)

pyamf/trunk/pyamf/remoting/__init__.py

@@ -202 +202 @@
         return "<%s status=%s>%s</%s>" % (
             type(self).__name__, _get_status(self.status), self.body,
-            type(self).__name__)
+            type(self).__name__
+        )
 
 class BaseFault(object):

pyamf/trunk/pyamf/remoting/client/__init__.py

@@ -45 +45 @@
         Inform the proxied service that this function has been called.
         """
+        
         return self.service._call(self, *args)
 
@@ -231 +232 @@
             raise ValueError, 'Unknown scheme'
 
-        self.logger.debug('creating connection to %s://%s:%s' % (self.url[0], hostname, port))
+        self.logger.info('Creating connection to %s://%s:%s' % (self.url[0], hostname, port))
 
     def addHeader(self, name, value, must_understand=False):
@@ -274 +275 @@
         self.request_number += 1
         self.requests.append(wrapper)
-        self.logger.debug('adding request %s%r' % (wrapper.service, args))
+        self.logger.debug('Adding request %s%r' % (wrapper.service, args))
 
         return wrapper
@@ -285 +286 @@
         """
         if isinstance(service, RequestWrapper):
+            self.logger.debug('Removing request: %s' % (self.requests[self.requests.index(service)]))
             del self.requests[self.requests.index(service)]
 
@@ -291 +293 @@
         for request in self.requests:
             if request.service == service and request.args == args:
+                self.logger.debug('Removing request: %s' % (self.requests[self.requests.index(request)]))
                 del self.requests[self.requests.index(request)]
 
@@ -307 +310 @@
         """
         envelope = remoting.Envelope(self.amf_version, self.client_type)
-
+        
+        self.logger.debug('AMF version: %s' % self.amf_version)
+        self.logger.debug('Client type: %s' % self.client_type)
+        
         for request in requests:
             service = request.service
@@ -327 +333 @@
         @rtype:
         """
-        self.logger.debug('executing single request')
+        self.logger.debug('Executing single request: %s' % request)
         body = remoting.encode(self.getAMFRequest([request]))
 
-        self.logger.debug('sending POST request to %s' % self._root_url)
+        self.logger.debug('Sending POST request to %s' % self._root_url)
         self.connection.request('POST', self._root_url, body.getvalue(),
             {'Content-Type': remoting.CONTENT_TYPE})
@@ -346 +352 @@
         body = remoting.encode(self.getAMFRequest(self.requests))
 
+        self.logger.debug('Sending POST request to %s' % self._root_url)
         self.connection.request('POST', self._root_url, body.getvalue(),
             {'Content-Type': remoting.CONTENT_TYPE})
@@ -363 +370 @@
         Gets and handles the HTTP response from the remote gateway.
         """
-        self.logger.debug('waiting for response ...')
+        self.logger.debug('Waiting for response...')
         http_response = self.connection.getresponse()
-        self.logger.debug('got response status=%s' % http_response.status)
-
+        self.logger.debug('Got response status = %s' % http_response.status)
+        self.logger.debug('Content-Type = %s' % http_response.getheader('Content-Type'))
+        
         if http_response.status != HTTP_OK:
-            self.logger.debug('content-type = %s' % http_response.getheader('Content-Type'))
-            self.logger.debug('body = %s' % http_response.read())
+            self.logger.debug('Body = %s' % http_response.read())
 
             if hasattr(httplib, 'responses'):
@@ -381 +388 @@
 
         if content_type != remoting.CONTENT_TYPE:
-            self.logger.debug('content-type = %s' % http_response.getheader('Content-Type'))
-            self.logger.debug('body = %s' % http_response.read())
+            self.logger.debug('Body = %s' % http_response.read())
 
             raise remoting.RemotingError, "Incorrect MIME type received. (got: %s)" % content_type
@@ -388 +394 @@
         content_length = http_response.getheader('Content-Length')
         bytes = ''
+
+        self.logger.debug('Content-Length = %s' % content_length)
 
         if content_length is None:
@@ -394 +402 @@
             bytes = http_response.read(content_length)
 
-        self.logger.debug('read %d bytes for the response' % len(bytes))
+        self.logger.debug('Read %d bytes for the response' % len(bytes))
 
         response = remoting.decode(bytes)
-        self.logger.debug('response = %s' % response)
+        self.logger.debug('Response = %s' % response)
 
         if remoting.APPEND_TO_GATEWAY_URL in response.headers: