Skip to content

Commit

Permalink
style: Apply black
Browse files Browse the repository at this point in the history
  • Loading branch information
last-partizan committed Nov 3, 2023
1 parent 5c843e6 commit d1c6993
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 24 deletions.
3 changes: 0 additions & 3 deletions django_mongoengine/fields/djangoflavor.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ def __init__(self, *args, **kwargs):
self.remote_field = None
self.is_relation = self.remote_field is not None


def _get_verbose_name(self):
return self._verbose_name or self.db_field.replace('_', ' ')

Expand Down Expand Up @@ -146,7 +145,6 @@ def __hash__(self):

class StringField(DjangoField):
def formfield(self, form_class=forms.CharField, choices_form_class=None, **kwargs):

defaults = {}

if self.max_length and not self.choices:
Expand Down Expand Up @@ -285,7 +283,6 @@ def formfield(self, **kwargs):

class FileField(DjangoField):
def __init__(self, *args, **kwargs):

kwargs['max_length'] = kwargs.get('max_length', 100)
super().__init__(*args, **kwargs)

Expand Down
12 changes: 3 additions & 9 deletions django_mongoengine/forms/documents.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ def save_instance(
# see BaseDocumentForm._post_clean for an explanation
if hasattr(form, '_delete_before_save'):
fields = instance._fields
new_fields = {
n: f for n, f in fields.items() if n not in form._delete_before_save
}
new_fields = {n: f for n, f in fields.items() if n not in form._delete_before_save}
if hasattr(instance, '_changed_fields'):
for field in form._delete_before_save:
instance._changed_fields.remove(field)
Expand Down Expand Up @@ -347,9 +345,7 @@ def __init__(
self.instance = instance
self.save_as_new = save_as_new

super().__init__(
data, files, prefix=prefix, queryset=queryset, **kwargs
)
super().__init__(data, files, prefix=prefix, queryset=queryset, **kwargs)

def initial_form_count(self):
if self.save_as_new:
Expand Down Expand Up @@ -423,9 +419,7 @@ def __init__(
**kwargs
):
self.parent_document = parent_document
super().__init__(
data, files, instance, save_as_new, prefix, queryset, **kwargs
)
super().__init__(data, files, instance, save_as_new, prefix, queryset, **kwargs)

def _construct_form(self, i, **kwargs):
defaults = {'parent_document': self.parent_document}
Expand Down
4 changes: 1 addition & 3 deletions django_mongoengine/forms/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,7 @@ def __init__(self, form, *args, **kwargs):
kwargs['widget'] = EmbeddedFieldWidget(self.form.fields)
kwargs['initial'] = [f.initial for f in self.form.fields.values()]
kwargs['require_all_fields'] = False
super().__init__(
fields=tuple([f for f in self.form.fields.values()]), *args, **kwargs
)
super().__init__(fields=tuple([f for f in self.form.fields.values()]), *args, **kwargs)

def bound_data(self, data, initial):
return data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
from django_mongoengine.mongo_auth.models import MongoUser
from django_mongoengine.sessions import DEFAULT_CONNECTION_NAME


def get_default_username():
return "admin"


RE_VALID_USERNAME = re.compile(r'[\w.@+-]+$')

EMAIL_RE = re.compile(
Expand Down Expand Up @@ -92,7 +94,6 @@ def handle(self, *args, **options):
if interactive:
default_username = get_default_username()
try:

# Get a username
while 1:
if not username:
Expand Down
6 changes: 1 addition & 5 deletions django_mongoengine/mongo_admin/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,16 +266,13 @@ def construct_search(field_name):
search_fields = self.get_search_fields(request)

if search_fields and search_term:
orm_lookups = [
construct_search(str(search_field)) for search_field in search_fields
]
orm_lookups = [construct_search(str(search_field)) for search_field in search_fields]
for bit in search_term.split():
or_queries = [Q(**{orm_lookup: bit}) for orm_lookup in orm_lookups]
queryset = queryset.filter(reduce(operator.or_, or_queries))

return queryset, False


def get_changelist(self, request, **kwargs):
"""
Returns the ChangeList class for use on the changelist page.
Expand Down Expand Up @@ -318,7 +315,6 @@ def media(self):

@csrf_protect_m
def changeform_view(self, request, object_id=None, form_url='', extra_context=None):

to_field = request.POST.get(TO_FIELD_VAR, request.GET.get(TO_FIELD_VAR))
if to_field and not self.to_field_allowed(request, to_field):
raise DisallowedModelAdminToField("The field %s cannot be referenced." % to_field)
Expand Down
1 change: 0 additions & 1 deletion django_mongoengine/mongo_admin/sites.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class AdminSite(sites.AdminSite):
index_template = "mongo_admin/index.html"

def register(self, model_or_iterable, admin_class=None, **options):

if isinstance(model_or_iterable, TopLevelDocumentMetaclass) and not admin_class:
admin_class = DocumentAdmin

Expand Down
1 change: 0 additions & 1 deletion django_mongoengine/mongo_admin/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ def _validate(cls, model):


def validate_inline(cls, parent, parent_model):

# model is already verified to exist and be a Model
if cls.fk_name: # default value is None
f = get_field(cls, cls.model, cls.model._meta, 'fk_name', cls.fk_name)
Expand Down
2 changes: 2 additions & 0 deletions django_mongoengine/mongo_admin/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@ def get_ordering(self, request=None, queryset=None):

# Add the given query's ordering fields, if any.
try:

def sign(t):
return t[1] > 0 and '+' or '-'

qs_ordering = [sign(t) + t[0] for t in queryset._ordering]
ordering.extend(qs_ordering)
except:
Expand Down
1 change: 0 additions & 1 deletion django_mongoengine/mongo_auth/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def make_password(raw_password):


class BaseUser:

is_anonymous = AbstractBaseUser.__dict__['is_anonymous']
is_authenticated = AbstractBaseUser.__dict__['is_authenticated']

Expand Down
1 change: 1 addition & 0 deletions django_mongoengine/utils/wrappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ def copy_class(source):
def decorator(cls):
def f(k):
return k not in cls.__dict__ and not k.startswith("__")

for k in filter(f, source.__dict__.keys()):
setattr(cls, k, source.__dict__[k])
return cls
Expand Down

0 comments on commit d1c6993

Please sign in to comment.