Merge pull request #50 from crccheck/all-http-responses

All the http responses

Author: crccheck

Diff for: .travis.yml

@@ -1,4 +1,12 @@
 language: python
+# DELETEME TravisCI support for Python 3.5
+# https://github.com/travis-ci/travis-ci/issues/4794
+addons:
+  apt:
+    sources:
+      - deadsnakes
+    packages:
+      - python3.5
 # Generate this env list with:
 # tox -l | awk '{ print "  - TOX_ENV="$0}'
 env:
@@ -12,11 +20,11 @@ env:
   - TOX_ENV=django17-py34
   - TOX_ENV=django18-py27
   - TOX_ENV=django18-py34
+  - TOX_ENV=django18-py35
   - TOX_ENV=django19-py27
   - TOX_ENV=django19-py34
-  # pending full travisci support for python 3.5
-  # - TOX_ENV=django18-py35
-  - TOX_ENV=coveralls-django18-py27
+  - TOX_ENV=django19-py35
+  - TOX_ENV=coveralls-django19-py27
 install: pip install tox coveralls
 script: tox -e $TOX_ENV
 after_success: coveralls

Diff for: django_object_actions/utils.py

@@ -6,7 +6,8 @@
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 from django.db.models.query import QuerySet
-from django.http import Http404, HttpResponse, HttpResponseRedirect
+from django.http import Http404, HttpResponseRedirect
+from django.http.response import HttpResponseBase
 from django.views.generic import View
 from django.views.generic.detail import SingleObjectMixin
 
@@ -172,7 +173,7 @@ def get(self, request, **kwargs):
             raise Http404(u'Tool does not exist')
 
         ret = tool(request, obj)
-        if isinstance(ret, HttpResponse):
+        if isinstance(ret, HttpResponseBase):
             return ret
 
         back = reverse(self.back, args=(kwargs['pk'],))
@@ -186,10 +187,8 @@ def message_user(self, request, message):
         Mimic Django admin actions's `message_user`.
 
         Like the second example:
-        https://docs.djangoproject.com/en/1.7/ref/contrib/admin/actions/#custom-admin-action
+        https://docs.djangoproject.com/en/1.9/ref/contrib/admin/actions/#custom-admin-action
         """
-        # copied from django.contrib.admin.options
-        # included to mimic admin actions
         messages.info(request, message)
 
 

Diff for: setup.py

@@ -4,9 +4,9 @@
 setup(
     name='django-object-actions',
     version='0.6.0',
-    author="Chris Chang",
+    author='Chris Chang',
     author_email='c@crccheck.com',
-    url="https://github.com/crccheck/django-object-actions",
+    url='https://github.com/crccheck/django-object-actions',
     packages=[
         'django_object_actions',
     ],
@@ -16,11 +16,11 @@
     long_description=open('README.rst').read(),
     classifiers=[
         'Development Status :: 4 - Beta',
-        "Framework :: Django",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: Apache Software License",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python :: 2",
+        'Framework :: Django',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',

Diff for: tox.ini

@@ -8,7 +8,7 @@ envlist =
     django18-{py27,py34,py35},
     django19-{py27,py34,py35},
     # run one of the tests again but with coverage
-    coveralls-django18-py27,
+    coveralls-django19-py27,
 skipsdist = True
 
 [testenv]