aboutsummaryrefslogtreecommitdiffstats
path: root/flywheel/resource.py
diff options
context:
space:
mode:
authorTom Christie2011-01-28 17:42:57 +0000
committerTom Christie2011-01-28 17:42:57 +0000
commit40f47a9fb31aebd965dce03ae57c036d5360d124 (patch)
tree9e95ee3e500b5c2d8eb4e1adecefaf1d2de47b8a /flywheel/resource.py
parent2e9fd9c6b93a77dcf5caa42a4d71b9da2021693f (diff)
downloaddjango-rest-framework-40f47a9fb31aebd965dce03ae57c036d5360d124.tar.bz2
Minor bit of tidy up (all the stuff I noticed when demoing to francis)
Diffstat (limited to 'flywheel/resource.py')
-rw-r--r--flywheel/resource.py13
1 files changed, 9 insertions, 4 deletions
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