[Django] #28873: More of dict.setdefault

3 views
Skip to first unread message

Django

unread,
Dec 1, 2017, 11:51:25 AM12/1/17
to django-...@googlegroups.com
#28873: More of dict.setdefault
------------------------------------------+------------------------
Reporter: Дилян Палаузов | Owner: nobody
Type: Uncategorized | Status: new
Component: Uncategorized | Version: 1.11
Severity: Normal | Keywords:
Triage Stage: Unreviewed | Has patch: 0
Needs documentation: 0 | Needs tests: 0
Patch needs improvement: 0 | Easy pickings: 0
UI/UX: 0 |
------------------------------------------+------------------------
{{{
diff --git a/django/db/models/fields/__init__.py
b/django/db/models/fields/__init__.py
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -1645,7 +1645,7 @@ class EmailField(CharField):

def __init__(self, *args, **kwargs):
# max_length=254 to be compliant with RFCs 3696 and 5321
- kwargs['max_length'] = kwargs.get('max_length', 254)
+ kwargs.setdefault('max_length', 254)
super().__init__(*args, **kwargs)

def deconstruct(self):
@@ -1671,7 +1671,7 @@ class FilePathField(Field):
recursive=False, allow_files=True, allow_folders=False,
**kwargs):
self.path, self.match, self.recursive = path, match, recursive
self.allow_files, self.allow_folders = allow_files, allow_folders
- kwargs['max_length'] = kwargs.get('max_length', 100)
+ kwargs.setdefault('max_length', 100)
super().__init__(verbose_name, name, **kwargs)

def check(self, **kwargs):
@@ -2251,7 +2251,7 @@ class URLField(CharField):
description = _("URL")

def __init__(self, verbose_name=None, name=None, **kwargs):
- kwargs['max_length'] = kwargs.get('max_length', 200)
+ kwargs.setdefault('max_length', 200)
super().__init__(verbose_name, name, **kwargs)

def deconstruct(self):
diff --git a/django/db/models/fields/files.py
b/django/db/models/fields/files.py
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -226,7 +226,7 @@ class FileField(Field):
self.storage = storage or default_storage
self.upload_to = upload_to

- kwargs['max_length'] = kwargs.get('max_length', 100)
+ kwargs.setdefault('max_length', 100)
super().__init__(verbose_name, name, **kwargs)

def check(self, **kwargs):
diff --git a/django/db/models/fields/related.py
b/django/db/models/fields/related.py
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -809,7 +809,7 @@ class ForeignKey(ForeignObject):
on_delete=on_delete,
)

- kwargs['db_index'] = kwargs.get('db_index', True)
+ kwargs.setdefault('db_index', True)

super().__init__(to, on_delete, from_fields=['self'],
to_fields=[to_field], **kwargs)

}}}

--
Ticket URL: <https://code.djangoproject.com/ticket/28873>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.

Django

unread,
Dec 4, 2017, 10:57:41 AM12/4/17
to django-...@googlegroups.com
#28873: Use dict.setdefault() to set model and form field defaults
-------------------------------------+-------------------------------------

Reporter: Дилян Палаузов | Owner: nobody
Type: | Status: new
Cleanup/optimization |
Component: Core (Other) | Version: 1.11
Severity: Normal | Resolution:
Keywords: | Triage Stage: Ready for
| checkin
Has patch: 1 | Needs documentation: 0

Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 0 | UI/UX: 0
-------------------------------------+-------------------------------------
Changes (by Tim Graham):

* component: Uncategorized => Core (Other)
* has_patch: 0 => 1
* type: Uncategorized => Cleanup/optimization
* stage: Unreviewed => Ready for checkin


Comment:

[https://github.com/django/django/pull/9418 PR] from the patch.

--
Ticket URL: <https://code.djangoproject.com/ticket/28873#comment:1>

Django

unread,
Dec 4, 2017, 2:03:51 PM12/4/17
to django-...@googlegroups.com
#28873: Use dict.setdefault() to set model and form field defaults
-------------------------------------+-------------------------------------
Reporter: Дилян Палаузов | Owner: nobody
Type: | Status: closed

Cleanup/optimization |
Component: Core (Other) | Version: 1.11
Severity: Normal | Resolution: fixed

Keywords: | Triage Stage: Ready for
| checkin
Has patch: 1 | Needs documentation: 0

Needs tests: 0 | Patch needs improvement: 0
Easy pickings: 0 | UI/UX: 0
-------------------------------------+-------------------------------------
Changes (by Tim Graham <timograham@…>):

* status: new => closed
* resolution: => fixed


Comment:

In [changeset:"87c76aa116ef49be2d6ff3ecf2fec37414638246" 87c76aa]:
{{{
#!CommitTicketReference repository=""
revision="87c76aa116ef49be2d6ff3ecf2fec37414638246"
Fixed #28873 -- Used dict.setdefault() to set model and form field
defaults.
}}}

--
Ticket URL: <https://code.djangoproject.com/ticket/28873#comment:2>

Reply all
Reply to author
Forward
0 new messages