Skip to content

Commit

Permalink
fix flake8 errors
Browse files Browse the repository at this point in the history
  • Loading branch information
PetrDlouhy committed Dec 16, 2021
1 parent 015ab12 commit 47f283b
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 26 deletions.
4 changes: 3 additions & 1 deletion mass_demo/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
"""

import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mass_demo.settings")

from django.core.wsgi import get_wsgi_application

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mass_demo.settings")

application = get_wsgi_application()
1 change: 0 additions & 1 deletion massadmin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@
'''

default_app_config = 'massadmin.apps.MassAdminConfig'

21 changes: 10 additions & 11 deletions massadmin/massadmin.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
from django.utils.translation import gettext_lazy as _
try:
from django.utils.encoding import force_str
except: # 1.4 compat
except ImportError: # 1.4 compat
from django.utils.encoding import force_unicode as force_str
from django.utils.safestring import mark_safe
from django.contrib.admin.views.decorators import staff_member_required
Expand Down Expand Up @@ -100,12 +100,14 @@ def mass_change_view(request, app_name, model_name, object_ids, admin_site=None)
model = get_model(app_name, model_name)
ma = MassAdmin(model, admin_site or admin.site)
return ma.mass_change_view(request, object_ids)


mass_change_view = staff_member_required(mass_change_view)


def get_formsets(model, request, obj=None):
try: # Django>=1.9
return [f for f,_ in model.get_formsets_with_inlines(request, obj)]
return [f for f, _ in model.get_formsets_with_inlines(request, obj)]
except AttributeError:
return model.get_formsets(request, obj)

Expand Down Expand Up @@ -133,7 +135,7 @@ def get_overrided_properties(self):
if cl is admin.ModelAdmin:
break
for k, v in cl.__dict__.items():
if not k in items:
if k not in items:
items[k] = v
return items

Expand Down Expand Up @@ -316,7 +318,7 @@ def mass_change_view(
# Raise error for rollback transaction in atomic block
raise ValidationError("Not all forms is correct")

except:
except Exception:
general_error = sys.exc_info()[1]

form = ModelForm(instance=obj)
Expand All @@ -338,20 +340,17 @@ def mass_change_view(

# We don't want the user trying to mass change unique fields!
unique_fields = []
try: # Django >= 1.9
fields = model._meta.get_fields()
except:
fields = model._meta.get_all_field_names()
fields = model._meta.get_fields()
for field_name in fields:
try:
field = model._meta.get_field(field_name)
if field.unique:
unique_fields.append(field_name)
except:
except Exception:
pass

# Buggy! Use at your own risk
#inline_admin_formsets = []
# inline_admin_formsets = []
# for inline, formset in zip(self.inline_instances, formsets):
# fieldsets = list(inline.get_fieldsets(request, obj))
# inline_admin_formset = helpers.InlineAdminFormSet(inline, formset, fieldsets)
Expand All @@ -367,7 +366,7 @@ def mass_change_view(
'exclude_fields': exclude_fields,
'is_popup': '_popup' in request.GET or '_popup' in request.POST,
'media': mark_safe(media),
#'inline_admin_formsets': inline_admin_formsets,
# 'inline_admin_formsets': inline_admin_formsets,
'errors': errors_list,
'general_error': general_error,
'app_label': opts.app_label,
Expand Down
1 change: 1 addition & 0 deletions massadmin/templatetags/truncchar.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

register = template.Library()


@register.filter('truncchar')
# truncate after a certain number of characters
def truncchar(value, arg):
Expand Down
8 changes: 5 additions & 3 deletions massadmin/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@


urlpatterns = [
re_path(r'(?P<app_name>[^/]+)/(?P<model_name>[^/]+)-masschange/(?P<object_ids>[\w,\.\-]+)/$',
mass_change_view,
name='massadmin_change_view'),
re_path(
r'(?P<app_name>[^/]+)/(?P<model_name>[^/]+)-masschange/(?P<object_ids>[\w,\.\-]+)/$',
mass_change_view,
name='massadmin_change_view',
),
]
14 changes: 7 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from setuptools import setup, find_packages

setup(
name = "django-mass-edit",
name="django-mass-edit",
version="3.3.0",
author = "David Burke",
author_email = "[email protected]",
description = ("Make bulk changes in the Django admin interface"),
license = "BSD",
keywords = "django admin",
url = "https://github.com/burke-software/django-mass-edit",
author="David Burke",
author_email="[email protected]",
description=("Make bulk changes in the Django admin interface"),
license="BSD",
keywords="django admin",
url="https://github.com/burke-software/django-mass-edit",
packages=find_packages(),
include_package_data=True,
classifiers=[
Expand Down
2 changes: 1 addition & 1 deletion tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# coding: utf-8
# coding: utf-8
1 change: 1 addition & 0 deletions tests/mocks.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from massadmin.massadmin import MassAdmin


class MockRenderMassAdmin(MassAdmin):
def render_mass_change_form(
self,
Expand Down
2 changes: 2 additions & 0 deletions tests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@

class CustomAdminModel(models.Model):
name = models.CharField(max_length=32)

class Meta:
app_label = "tests"


class InheritedAdminModel(models.Model):
name = models.CharField(max_length=32)
fk_field = models.ForeignKey(CustomAdminModel, null=True, blank=True, on_delete=models.CASCADE)

class Meta:
app_label = "tests"
1 change: 1 addition & 0 deletions tests/site.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.contrib.admin.sites import AdminSite


class CustomAdminSite(AdminSite):
def each_context(self, request):
context = super(CustomAdminSite, self).each_context(request)
Expand Down
4 changes: 2 additions & 2 deletions tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
from .mocks import MockRenderMassAdmin


def get_massadmin_url(objects,session):
def get_massadmin_url(objects, session):
if not hasattr(objects, "__iter__"):
objects = [objects]
opts = objects[0]._meta
return get_mass_change_redirect_url(opts,[o.pk for o in objects],session)
return get_mass_change_redirect_url(opts, [o.pk for o in objects], session)


def get_changelist_url(model, admin_name='admin'):
Expand Down

0 comments on commit 47f283b

Please sign in to comment.