Merge ~adam-collard/maas:django-deprecation into maas:master

Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 9bd91871d51b0a28e2af61bcc4b82ebd1fa511d7
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:django-deprecation
Merge into: maas:master
Diff against target: 31 lines (+3/-3)
1 file modified
src/maasserver/fields.py (+3/-3)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
MAAS Lander Approve
Review via email: mp+408411@code.launchpad.net

Commit message

Remove deprecated (unused) context argument from fields.

To see the DeprecationWarning run

PYTHONWARNINGS=module:::django.db.models.sql.compiler: bin/test.region src/maasserver/tests/test_fields.py

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b django-deprecation lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 9bd91871d51b0a28e2af61bcc4b82ebd1fa511d7

review: Approve
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/fields.py b/src/maasserver/fields.py
2index 5b37f27..fd94b24 100644
3--- a/src/maasserver/fields.py
4+++ b/src/maasserver/fields.py
5@@ -160,7 +160,7 @@ class MACAddressField(Field):
6 def to_python(self, value):
7 return MAC(value)
8
9- def from_db_value(self, value, expression, connection, context):
10+ def from_db_value(self, value, expression, connection):
11 return MAC(value)
12
13 def get_prep_value(self, value):
14@@ -305,7 +305,7 @@ class JSONObjectField(Field):
15 else:
16 return None
17
18- def from_db_value(self, value, expression, connection, context):
19+ def from_db_value(self, value, expression, connection):
20 return self.to_python(value)
21
22 def get_db_prep_value(self, value, connection=None, prepared=False):
23@@ -530,7 +530,7 @@ class CIDRField(Field):
24 return None
25 return self.parse_cidr(value)
26
27- def from_db_value(self, value, expression, connection, context):
28+ def from_db_value(self, value, expression, connection):
29 if value is None:
30 return value
31 return self.parse_cidr(value)

Subscribers

People subscribed via source and target branches