Commits

Lynn Rees committed b9ebbc8

[svn]

  • Participants
  • Parent commits 3d19519
  • Branches wsgiserializer

Comments (0)

Files changed (4)

branches/0.3/trunk/wsgiserialize/__init__.py

-__all__ = ['json', 'cpickler', 'pickler', 'yaml', 'xmlrpc', 'marshal']
+__all__ = ['json', 'cpickler', 'pickler', 'yaml', 'xmlrpc', 'marshaller']

branches/0.3/trunk/wsgiserialize/tests/test_wsgiserialize.py

         self.assertEqual(dummy_app({}, ()), ['{"int": 1, "dict": {}, "list": [], "str": "", "tuple": []}'])
 
     def test_marshaller(self):
-        @marshal.marshaller
+        @marshaller.marshaller
         def dummy_app(environ, start_response):
             return dict(tuple=(), list=[], str='', dict={}, int=1)
         self.assertEqual(dummy_app({}, ()), '')

branches/0.3/trunk/wsgiserialize/yaml.py

-# Copyright (c) 2006 L. C. Rees.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1.  Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3.  Neither the name of the Portable Site Information Project nor the names
-# of its contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-import yaml
-
-__all__ = ['WSGIYaml', 'yamlize']    
-
-def yamlize(application):
-    '''Decorator for YaML serialization.
-
-    @param application WSGI application.
-    ''' 
-    return WSGIYaml(application)
-
-
-class WSGIYaml(object):
-
-    '''WSGI middleware for serializing simple Python objects to YaML.'''
-    
-    def __init__(self, application):
-        '''Initializes the class.
-
-        @param application WSGI application.
-        '''        
-        self.application = application
-
-    def __call__(self, environ, start_response):
-        '''Serializes simple Python objects to YaML.'''
-        return [yaml.dump(self.application(environ, start_response))]

branches/0.3/trunk/wsgiserialize/yamlize.py

+# Copyright (c) 2006 L. C. Rees.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1.  Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3.  Neither the name of the Portable Site Information Project nor the names
+# of its contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+import yaml
+
+__all__ = ['WSGIYaml', 'yamlize']    
+
+def yamlize(application):
+    '''Decorator for YaML serialization.
+
+    @param application WSGI application.
+    ''' 
+    return WSGIYaml(application)
+
+
+class WSGIYaml(object):
+
+    '''WSGI middleware for serializing simple Python objects to YaML.'''
+    
+    def __init__(self, application):
+        '''Initializes the class.
+
+        @param application WSGI application.
+        '''        
+        self.application = application
+
+    def __call__(self, environ, start_response):
+        '''Serializes simple Python objects to YaML.'''
+        return [yaml.dump(self.application(environ, start_response))]