← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jtv/maas/comment-models-init into lp:maas

 

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/comment-models-init into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/comment-models-init/+merge/103043

This adds some docstring text to the new src/*/models/__init__.py to say that new models should not go in there (and how to deal with them instead).

At the same time, this is a final test of what happens to a branch that edits the old models.py, but has its changes proposed for merging into the new models/__init__.py.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/comment-models-init/+merge/103043
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/comment-models-init into lp:maas.
=== modified file 'src/maasserver/models/__init__.py'
--- src/maasserver/models/__init__.py	2012-04-23 03:04:42 +0000
+++ src/maasserver/models/__init__.py	2012-04-23 03:46:21 +0000
@@ -1,7 +1,11 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""MAAS model objects."""
+"""MAAS model objects.
+
+DO NOT add new models to this module.  Add them to the package as separate
+modules, but import them here and add them to `__all__`.
+"""
 
 from __future__ import (
     absolute_import,

=== modified file 'src/metadataserver/models/__init__.py'
--- src/metadataserver/models/__init__.py	2012-04-23 03:04:42 +0000
+++ src/metadataserver/models/__init__.py	2012-04-23 03:46:21 +0000
@@ -1,7 +1,11 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Model for the metadata server."""
+"""Model for the metadata server.
+
+DO NOT add new models to this module.  Add them to the package as separate
+modules, but import them here and add them to `__all__`.
+"""
 
 from __future__ import (
     absolute_import,