Merge lp:~allenap/maas/top-of-file-boilerplate into lp:maas/trunk

[Gavin Panella]

Top-of-the-file boilerplate, lint, and import formatting.

[Raphaël Badin (rvb)]

Looks good.

[1]

230 +__all__ = [
231 + "Factory",

Not sure we need to expose the class itself. The singleton should be sufficient.

review: Approve

=== modified file 'setup.py'
--- setup.py	2012-01-19 10:48:02 +0000
+++ setup.py	2012-01-19 11:40:41 +0000
@@ -1,7 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+from __future__ import print_function
+
 """Distutils installer for maas."""
 
 import os

=== modified file 'src/maas/development.py'
--- src/maas/development.py	2012-01-19 10:48:02 +0000
+++ src/maas/development.py	2012-01-19 11:40:41 +0000
@@ -1,5 +1,12 @@
-
-# Django development settings for maas project.
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Django DEVELOPMENT settings for maas project."""
+
+__metaclass__ = type
+__all__ = []
 
 import os
 

=== modified file 'src/maas/production.py'
--- src/maas/production.py	2012-01-16 08:33:18 +0000
+++ src/maas/production.py	2012-01-19 11:40:41 +0000
@@ -1,2 +1,11 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Django PRODUCTION settings for maas project."""
+
+__metaclass__ = type
+__all__ = []
 
 from maas.settings import *

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2012-01-19 10:48:02 +0000
+++ src/maas/settings.py	2012-01-19 11:40:41 +0000
@@ -1,5 +1,12 @@
-
-# Django settings for maas project.
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Django settings for maas project."""
+
+__metaclass__ = type
+__all__ = []
 
 import os
 

=== modified file 'src/maas/testing/__init__.py'
--- src/maas/testing/__init__.py	2012-01-18 17:08:17 +0000
+++ src/maas/testing/__init__.py	2012-01-19 11:40:41 +0000
@@ -1,5 +1,12 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Test related classes and functions for maas and its applications."""
+
+__metaclass__ = type
 __all__ = []
-__metaclass__ = type
 
 import django.test
 import testresources

=== modified file 'src/maas/testing/runner.py'
--- src/maas/testing/runner.py	2012-01-18 17:08:17 +0000
+++ src/maas/testing/runner.py	2012-01-19 11:40:41 +0000
@@ -1,3 +1,15 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Test runner for maas and its applications."""
+
+__metaclass__ = type
+__all__ = [
+    "TestRunner",
+    ]
+
 from subprocess import check_call
 
 from django.test.simple import DjangoTestSuiteRunner

=== modified file 'src/maas/urls.py'
--- src/maas/urls.py	2012-01-18 17:08:17 +0000
+++ src/maas/urls.py	2012-01-19 11:40:41 +0000
@@ -1,3 +1,12 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""..."""
+
+__metaclass__ = type
+__all__ = []
 
 from django.conf import settings
 from django.conf.urls.defaults import *

=== modified file 'src/maasserver/api.py'
--- src/maasserver/api.py	2012-01-18 19:16:57 +0000
+++ src/maasserver/api.py	2012-01-19 11:40:41 +0000
@@ -1,11 +1,26 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""API."""
+
+__metaclass__ = type
+__all__ = [
+    "NodeHandler",
+    "NodeMacsHandler",
+    ]
+
 from django.core.exceptions import ValidationError
 from django.shortcuts import get_object_or_404
+from maasserver.macaddress import validate_mac
+from maasserver.models import (
+    MACAddress,
+    Node,
+    )
 from piston.handler import BaseHandler
 from piston.utils import rc
 
-from maasserver.models import Node, MACAddress
-from maasserver.macaddress import validate_mac
-
 
 def bad_request(message):
     resp = rc.BAD_REQUEST

=== modified file 'src/maasserver/context_processors.py'
--- src/maasserver/context_processors.py	2012-01-16 16:15:44 +0000
+++ src/maasserver/context_processors.py	2012-01-19 11:40:41 +0000
@@ -1,3 +1,15 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Context processors."""
+
+__metaclass__ = type
+__all__ = [
+    "yui",
+    ]
+
 from django.conf import settings
 
 

=== modified file 'src/maasserver/macaddress.py'
--- src/maasserver/macaddress.py	2012-01-19 10:48:02 +0000
+++ src/maasserver/macaddress.py	2012-01-19 11:40:41 +0000
@@ -1,3 +1,13 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""..."""
+
+__metaclass__ = type
+__all__ = []
+
 import re
 
 from django.core.validators import RegexValidator

=== modified file 'src/maasserver/models.py'
--- src/maasserver/models.py	2012-01-19 10:30:58 +0000
+++ src/maasserver/models.py	2012-01-19 11:40:41 +0000
@@ -1,3 +1,16 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Model."""
+
+__metaclass__ = type
+__all__ = [
+    "Node",
+    "MACAddress",
+    ]
+
 import datetime
 import re
 from uuid import uuid1

=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2012-01-18 19:16:57 +0000
+++ src/maasserver/testing/factory.py	2012-01-19 11:40:41 +0000
@@ -1,14 +1,30 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Test object factories."""
+
+__metaclass__ = type
+__all__ = [
+    "Factory",
+    "factory",
+    ]
+
+import random
 import string
-import random
 
-from maasserver.models import Node, MACAddress
+from maasserver.models import (
+    MACAddress,
+    Node,
+    )
 
 
 class Factory():
 
     def getRandomString(self, size):
         return "".join(
-            random.choice(string.letters+string.digits)
+            random.choice(string.letters + string.digits)
             for x in xrange(size))
 
     def make_node(self, hostname='', set_hostname=False, status=None,

=== modified file 'src/maasserver/tests/__init__.py'
--- src/maasserver/tests/__init__.py	2012-01-19 10:48:02 +0000
+++ src/maasserver/tests/__init__.py	2012-01-19 11:40:41 +0000
@@ -1,6 +1,11 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+from __future__ import print_function
+
+__metaclass__ = type
+__all__ = []
+
 from os.path import dirname
 
 from django.utils.unittest import defaultTestLoader

=== modified file 'src/maasserver/tests/test_api.py'
--- src/maasserver/tests/test_api.py	2012-01-18 19:16:57 +0000
+++ src/maasserver/tests/test_api.py	2012-01-19 11:40:41 +0000
@@ -1,12 +1,20 @@
-"""
-Test maasserver api.
-"""
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Test maasserver API."""
+
+__metaclass__ = type
+__all__ = []
 
 import json
 
-from django.test import TestCase
-
-from maasserver.models import Node, MACAddress
+from maas.testing import TestCase
+from maasserver.models import (
+    MACAddress,
+    Node,
+    )
 from maasserver.testing.factory import factory
 
 
@@ -65,7 +73,7 @@
 
         self.assertEqual(200, response.status_code)
         self.assertEqual('diane', parsed_result['hostname'])
-        self.assertEqual(1, Node.objects.filter(hostname= 'diane').count())
+        self.assertEqual(1, Node.objects.filter(hostname='diane').count())
 
     def test_node_PUT(self):
         """
@@ -79,8 +87,8 @@
 
         self.assertEqual(200, response.status_code)
         self.assertEqual('francis', parsed_result['hostname'])
-        self.assertEqual(0, Node.objects.filter(hostname= 'diane').count())
-        self.assertEqual(1, Node.objects.filter(hostname= 'francis').count())
+        self.assertEqual(0, Node.objects.filter(hostname='diane').count())
+        self.assertEqual(1, Node.objects.filter(hostname='francis').count())
 
     def test_node_PUT_404(self):
         """
@@ -189,7 +197,7 @@
         The api allows to add a MAC Address to an existing node.
 
         """
-        nb_macs = MACAddress.objects.filter(node = self.node).count()
+        nb_macs = MACAddress.objects.filter(node=self.node).count()
         response = self.client.post(
             '/api/nodes/%s/macs/' % self.node.system_id,
             {'mac_address': 'AA:BB:CC:DD:EE:FF'})
@@ -199,7 +207,7 @@
         self.assertEqual('AA:BB:CC:DD:EE:FF', parsed_result['mac_address'])
         self.assertEqual(
             nb_macs + 1,
-            MACAddress.objects.filter(node = self.node).count())
+            MACAddress.objects.filter(node=self.node).count())
 
     def test_macs_POST_add_mac_invalid(self):
         """

=== modified file 'src/maasserver/tests/test_macaddressfield.py'
--- src/maasserver/tests/test_macaddressfield.py	2012-01-19 10:30:58 +0000
+++ src/maasserver/tests/test_macaddressfield.py	2012-01-19 11:40:41 +0000
@@ -10,8 +10,8 @@
 
 from django.core.exceptions import ValidationError
 from maas.testing import TestCase
+from maasserver.macaddress import validate_mac
 from maasserver.models import MACAddress
-from maasserver.macaddress import validate_mac
 from maasserver.testing.factory import factory
 
 

=== modified file 'src/maasserver/urls.py'
--- src/maasserver/urls.py	2012-01-19 10:30:58 +0000
+++ src/maasserver/urls.py	2012-01-19 11:40:41 +0000
@@ -1,13 +1,28 @@
-
-from django.conf.urls.defaults import *
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""URL routing configuration."""
+
+__metaclass__ = type
+__all__ = []
+
+from django.conf.urls.defaults import (
+    patterns,
+    url,
+    )
 from django.views.generic import ListView
-from piston.resource import Resource
+from maasserver.api import (
+    NodeHandler,
+    NodeMacsHandler,
+    )
 from maasserver.models import Node
 from maasserver.views import (
     NodesCreateView,
     NodeView,
     )
-from maasserver.api import NodeHandler, NodeMacsHandler
+from piston.resource import Resource
 
 
 urlpatterns = patterns('maasserver.views',
@@ -28,4 +43,3 @@
     url(r'^api/nodes/([\w\-]+)/$', node_handler),
     url(r'^api/nodes/$', node_handler),
 )
-

=== modified file 'src/maasserver/views.py'
--- src/maasserver/views.py	2012-01-18 21:41:52 +0000
+++ src/maasserver/views.py	2012-01-19 11:40:41 +0000
@@ -1,3 +1,16 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from __future__ import print_function
+
+"""Views."""
+
+__metaclass__ = type
+__all__ = [
+    "NodeView",
+    "NodesCreateView",
+    ]
+
 from django.shortcuts import get_object_or_404
 from django.views.generic import (
     CreateView,

=== modified file 'templates/module.py'
--- templates/module.py	2012-01-18 16:20:05 +0000
+++ templates/module.py	2012-01-19 11:40:41 +0000
@@ -1,9 +1,9 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+from __future__ import print_function
+
 """..."""
 
-from __future__ import print_function
-
 __metaclass__ = type
 __all__ = []

=== modified file 'templates/test.py'
--- templates/test.py	2012-01-18 16:20:05 +0000
+++ templates/test.py	2012-01-19 11:40:41 +0000
@@ -1,10 +1,10 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+from __future__ import print_function
+
 """..."""
 
-from __future__ import print_function
-
 __metaclass__ = type
 __all__ = []
 

=== modified file 'utilities/format-imports'
--- utilities/format-imports	2012-01-18 21:15:50 +0000
+++ utilities/format-imports	2012-01-19 11:40:41 +0000
@@ -1,8 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.7
 #
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
+from __future__ import print_function
+
 """ Format import sections in python files
 
 = Usage =
@@ -376,7 +378,7 @@
     """Process the file with the given path."""
     changed = reformat_importsection(fpath)
     if changed:
-        print fpath
+        print(fpath)
 
 
 def process_tree(dpath):

=== modified file 'utilities/python_standard_libs.py'
--- utilities/python_standard_libs.py	2012-01-18 21:41:52 +0000
+++ utilities/python_standard_libs.py	2012-01-19 11:40:41 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """ A list of top-level standard python library names.