launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #08176
[Merge] lp:~jtv/maas/prep-userprofile into lp:maas
Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/prep-userprofile into lp:maas.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~jtv/maas/prep-userprofile/+merge/107193
As per the migration plan. There's not much preparation to do for migrating these classes. I considered migrating the two functions for manipulating OAuth tokens along, but they act on User rather than on UserProfile.
You may see 3 test failures and 2 lint warnings, but those are in trunk.
Jeroen
--
https://code.launchpad.net/~jtv/maas/prep-userprofile/+merge/107193
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/prep-userprofile into lp:maas.
=== modified file 'src/maasserver/models/__init__.py'
--- src/maasserver/models/__init__.py 2012-05-24 09:41:34 +0000
+++ src/maasserver/models/__init__.py 2012-05-24 10:38:22 +0000
@@ -685,6 +685,7 @@
user=user, token_type=Token.ACCESS, is_approved=True).order_by('id')
+# Scheduled for model migration on 2012-06-01
class UserProfileManager(Manager):
"""A utility to manage the collection of UserProfile (or User).
@@ -708,6 +709,7 @@
return User.objects.filter(id__in=user_ids)
+# Scheduled for model migration on 2012-06-01
class UserProfile(CleanSave, Model):
"""A User profile to store MAAS specific methods and fields.