Changeset 1486 for pyamf/trunk

Timestamp:

07/08/08 19:51:10 (6 months ago)

Author:

nick

Message:

Reverting r1474

Location:

pyamf/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• pyamf/remoting/gateway/__init__.py (modified) (1 diff)
• pyamf/remoting/gateway/django.py (modified) (4 diffs)
• pyamf/remoting/gateway/google.py (modified) (8 diffs)
• pyamf/remoting/gateway/twisted.py (modified) (4 diffs)
• pyamf/remoting/gateway/wsgi.py (modified) (8 diffs)

pyamf/trunk/CHANGES.txt

@@ -7 +7 @@
 0.4.0 (unreleased)
 ------------------
- - The remoting gateways now send a customizable Server header (Ticket:317)
  - The remoting client now sends a customizable User-Agent header (Ticket:306)
  - Added ability to set the HTTP referer in remoting client (Ticket:316)

pyamf/trunk/pyamf/remoting/gateway/__init__.py

@@ -8 +8 @@
 """
 
-import platform
 import types
 
 import pyamf
 from pyamf import remoting, logging, util
-
-#: Value for the Server response-header that contains 
-#: information about the PyAMF and Python version used
-#: by the origin server to handle the request. 
-SERVER_NAME = 'PyAMF/%s Python/%s' % (
-    '.'.join(map(lambda x: str(x), pyamf.__version__)),
-    platform.python_version()
-)
 
 fault_alias = pyamf.get_class_alias(remoting.ErrorFault)

pyamf/trunk/pyamf/remoting/gateway/django.py

@@ -87 +87 @@
             request = remoting.decode(http_request.raw_post_data, context)
         except pyamf.DecodeError:
-            self.logger.exception(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
             http_response.status_code = 400
 
@@ -100 +100 @@
             raise
         except:
-            self.logger.exception(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             return http.HttpResponseServerError()
@@ -110 +110 @@
             stream = remoting.encode(response, context)
         except pyamf.EncodeError:
-            self.logger.exception(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             return http.HttpResponseServerError('Unable to encode the response')
@@ -117 +117 @@
         http_response['Content-Type'] = remoting.CONTENT_TYPE
         http_response['Content-Length'] = str(len(buf))
-        http_response['Server'] = gateway.SERVER_NAME
         http_response.write(buf)
 

pyamf/trunk/pyamf/remoting/gateway/google.py

@@ -60 +60 @@
     def get(self):
         self.response.headers['Content-Type'] = 'text/plain'
-        self.response.headers['Server'] = gateway.SERVER_NAME
         self.error(405)
         self.response.out.write("405 Method Not Allowed\n\n" + \
@@ -76 +75 @@
             request = remoting.decode(body, context)
         except pyamf.DecodeError:
-            self.logger.exception(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "400 Bad Request\n\nThe request body was unable to " \
@@ -86 +85 @@
             self.error(400)
             self.response.headers['Content-Type'] = 'text/plain'
-            self.response.headers['Server'] = gateway.SERVER_NAME
             self.response.out.write(response)
 
@@ -99 +97 @@
             raise
         except:
-            self.logger.exception(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -109 +107 @@
             self.error(500)
             self.response.headers['Content-Type'] = 'text/plain'
-            self.response.headers['Server'] = gateway.SERVER_NAME
             self.response.out.write(response)
 
@@ -120 +117 @@
             stream = remoting.encode(response, context)
         except pyamf.EncodeError:
-            self.logger.exception(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -130 +127 @@
             self.error(500)
             self.response.headers['Content-Type'] = 'text/plain'
-            self.response.headers['Server'] = gateway.SERVER_NAME
             self.response.out.write(response)
 
@@ -139 +135 @@
         self.response.headers['Content-Type'] = remoting.CONTENT_TYPE
         self.response.headers['Content-Length'] = str(len(response))
-        self.response.headers['Server'] = gateway.SERVER_NAME
-        
         self.response.out.write(response)
 

pyamf/trunk/pyamf/remoting/gateway/twisted.py

@@ -69 +69 @@
 
         def response_cb(result):
+            self.gateway.logger.debug("AMF Response: %r" % result)
             response.body = result
-
-            self.gateway.logger.debug("AMF Response: %r" % response)
             deferred_response.callback(response)
 
@@ -125 +124 @@
 
         def response_cb(result):
-            
+            self.gateway.logger.debug("AMF Response: %r" % result)
             ro_response.body = result
-            res = remoting.Response(ro_response)
-            self.gateway.logger.debug("AMF Response: %r" % res)
-            
-            deferred_response.callback(res)
+            deferred_response.callback(remoting.Response(ro_response))
 
         def process_cb(result):
@@ -199 +195 @@
         request.setHeader("Content-Type", mimetype)
         request.setHeader("Content-Length", str(len(content)))
-        request.setHeader("Server", gateway.SERVER_NAME)
 
         request.write(content)
@@ -215 +210 @@
             Return HTTP 400 Bad Request.
             """
-            self.logger.exception(failure.printDetailedTraceback())
+            self.logger.error(failure.printDetailedTraceback())
 
             body = "400 Bad Request\n\nThe request body was unable to " \

pyamf/trunk/pyamf/remoting/gateway/wsgi.py

@@ -61 +61 @@
             ('Content-Type', 'text/plain'),
             ('Content-Length', str(len(response))),
-            ('Server', gateway.SERVER_NAME),
         ])
 
@@ -83 +82 @@
             request = remoting.decode(body, context)
         except pyamf.DecodeError:
-            self.logger.exception(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "400 Bad Request\n\nThe request body was unable to " \
@@ -94 +93 @@
                 ('Content-Type', 'text/plain'),
                 ('Content-Length', str(len(response))),
-                ('Server', gateway.SERVER_NAME),
             ])
 
@@ -107 +105 @@
             raise
         except:
-            self.logger.exception(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -118 +116 @@
                 ('Content-Type', 'text/plain'),
                 ('Content-Length', str(len(response))),
-                ('Server', gateway.SERVER_NAME),
             ])
 
@@ -129 +126 @@
             stream = remoting.encode(response, context)
         except pyamf.EncodeError:
-            self.logger.exception(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -140 +137 @@
                 ('Content-Type', 'text/plain'),
                 ('Content-Length', str(len(response))),
-                ('Server', gateway.SERVER_NAME),
             ])
 
@@ -150 +146 @@
             ('Content-Type', remoting.CONTENT_TYPE),
             ('Content-Length', str(len(response))),
-            ('Server', gateway.SERVER_NAME),
         ])