From ced239de1bbe02059da69f77c67af0955f98c0a9 Mon Sep 17 00:00:00 2001
From: Christophe de Vienne <cdevienne@gmail.com>
Date: Wed, 19 Oct 2011 11:43:02 +0200
Subject: [PATCH] Rename list_calls to iter_calls and makes it an iterator.

---
 wsme/controller.py            | 5 +----
 wsme/rest.py                  | 4 ++--
 wsme/tests/test_controller.py | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/wsme/controller.py b/wsme/controller.py
index c8ebb47..02dc14f 100644
--- a/wsme/controller.py
+++ b/wsme/controller.py
@@ -298,10 +298,7 @@ class WSRoot(object):
                 return res
 
             context = None
-            calls = protocol.list_calls(request)
-
-            if isinstance(calls, CallContext):
-                calls = [calls]
+            calls = list(protocol.iter_calls(request))
 
             if len(calls) != 1:
                 raise NotImplementedError("Batch calls are not yet supported")
diff --git a/wsme/rest.py b/wsme/rest.py
index d794197..79464a7 100644
--- a/wsme/rest.py
+++ b/wsme/rest.py
@@ -16,8 +16,8 @@ class RestProtocol(object):
             return True
         return request.headers.get('Content-Type') in self.content_types
 
-    def list_calls(self, request):
-        return CallContext(request)
+    def iter_calls(self, request):
+        yield CallContext(request)
 
     def extract_path(self, context):
         path = context.request.path
diff --git a/wsme/tests/test_controller.py b/wsme/tests/test_controller.py
index 7f4e0e0..65406bc 100644
--- a/wsme/tests/test_controller.py
+++ b/wsme/tests/test_controller.py
@@ -21,8 +21,8 @@ class DummyProtocol(object):
     def accept(self, req):
         return True
 
-    def list_calls(self, req):
-        return CallContext(req)
+    def iter_calls(self, req):
+        yield CallContext(req)
 
     def extract_path(self, context):
         return ['touch']