From 40f47a9fb31aebd965dce03ae57c036d5360d124 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 28 Jan 2011 17:42:57 +0000
Subject: Minor bit of tidy up (all the stuff I noticed when demoing to
 francis)

---
 flywheel/resource.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'flywheel/resource.py')

diff --git a/flywheel/resource.py b/flywheel/resource.py
index 677bdfce..2a8554f3 100644
--- a/flywheel/resource.py
+++ b/flywheel/resource.py
@@ -58,14 +58,19 @@ class Resource(object):
     CSRF_PARAM = 'csrfmiddlewaretoken'    # Django's CSRF token used in form params
 
 
-    def __new__(cls, request, *args, **kwargs):
+    def __new__(cls, *args, **kwargs):
         """Make the class callable so it can be used as a Django view."""
         self = object.__new__(cls)
-        self.__init__(request)
-        return self._handle_request(request, *args, **kwargs)
+        if args:
+            request = args[0]
+            self.__init__(request)
+            return self._handle_request(request, *args[1:], **kwargs)
+        else:
+            self.__init__()
+            return self
 
 
-    def __init__(self, request):
+    def __init__(self, request=None):
         """"""
         # Setup the resource context
         self.request = request
-- 
cgit v1.2.3