SpyneView => DjangoView arskom#292

plq · plq · commit f6c542acab95 · 2013-11-21T12:59:27.000+02:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -27,7 +27,7 @@ spyne-2.11.0
   Sample response: ``{"ver":1, "fault": {"faultcode": "Server", "faultstring": "Internal Error"}}}``
 
 * Steal and integrate the WebSocket tranport for Twisted.
-* Support Django natively using :class:`spyne.server.django.SpyneView` and
+* Support Django natively using :class:`spyne.server.django.DjangoView` and
   :class:`spyne.server.django.DjangoServer`.
 * It's now possible to override the ``JsonEncoder`` class ``JsonDocument`` uses.
 * Remove hard-coded utf-8 defaults from almost everywhere.
diff --git a/doc/source/manual/05-03_django.rst b/doc/source/manual/05-03_django.rst
@@ -141,7 +141,7 @@ project/urls.py: ::
     configure_spyne()
     from spyne.application import Application
     from spyne.protocol.soap import Soap11
-    from spyne.server.django import SpyneView
+    from spyne.server.django import DjangoView
 
     from project.todo.todolists import TodoService
 
@@ -150,12 +150,12 @@ project/urls.py: ::
 
     urlpatterns = patterns(
         '',
-        url(r'^api/0.1/', SpyneView.as_view(application=api), name='api'),
+        url(r'^api/0.1/', DjangoView.as_view(application=api), name='api'),
     )
 
 First we configure spyne defaults. Then we create Spyne application that stores
 configuration for our setup.  Finally we define view `api` bound to specific url.
-``SpyneView.as_view`` created for us :class:`spyne.server.django.DjangoServer`
+``DjangoView.as_view`` created for us :class:`spyne.server.django.DjangoServer`
 instance that will handle rpc requests.
 
 Now we can run Django development server and look at WSDL that defines protocol
diff --git a/examples/django/rpctest/urls.py b/examples/django/rpctest/urls.py
@@ -30,14 +30,14 @@
 
 from django.conf.urls.defaults import patterns, include, url
 from spyne.protocol.soap import Soap11
-from spyne.server.django import SpyneView
+from spyne.server.django import DjangoView
 from rpctest.core.views import app, HelloWorldService
 
 
 urlpatterns = patterns('',
     url(r'^hello_world/','core.views.hello_world_service'),
-    url(r'^say_hello/', SpyneView.as_view(
+    url(r'^say_hello/', DjangoView.as_view(
         services=[HelloWorldService], tns='spyne.examples.django',
         in_protocol=Soap11(validator='lxml'), out_protocol=Soap11())),
-    url(r'^api/', SpyneView.as_view(application=app)),
+    url(r'^api/', DjangoView.as_view(application=app)),
 )
diff --git a/spyne/server/django.py b/spyne/server/django.py
@@ -109,7 +109,6 @@ def set_response(self, retval, response):
 
 
 class DjangoServer(HttpBase):
-
     """Server talking in Django request/response objects."""
 
     def __init__(self, app, chunked=False):
@@ -246,8 +245,7 @@ def response(self, response, p_ctx, others, error=None):
         return response
 
 
-class SpyneView(object):
-
+class DjangoView(object):
     """Represent spyne service as Django class based view."""
 
     application = None
diff --git a/spyne/test/interop/test_django.py b/spyne/test/interop/test_django.py
@@ -41,7 +41,7 @@ def _test_say_hello(self):
         self.assertEqual(list_resp,['Hello, Joe']*5)
 
 
-class SpyneViewTestCase(TestCase):
+class DjangoViewTestCase(TestCase):
     def test_say_hello(self):
         client = DjangoTestClient('/say_hello/', app)
         resp =  client.service.say_hello('Joe', 5)
