Merge pull request #42 from rabbbit/master

Add support for functool.partials in filename generation
bradleyg · Apr 15, 2015 · b2942a0 · b2942a0
2 parents 7c0c8a7 + c65e1d6
commit b2942a0
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/s3direct/views.py b/s3direct/views.py
@@ -1,5 +1,4 @@
 import json
-from inspect import isfunction
 
 from django.http import HttpResponse
 from django.views.decorators.http import require_POST
@@ -43,7 +42,7 @@ def get_upload_params(request):
         data = json.dumps({'error': 'Invalid file type (%s).' % content_type})
         return HttpResponse(data, content_type="application/json", status=400)
 
-    if isfunction(key):
+    if hasattr(key, '__call__'):
         key = key(filename)
     else:
         key = '%s/${filename}' % key