MAAS

Merge lp:~jtv/maas/so-what-if-it-is-an-object into lp:~maas-committers/maas/trunk

  1. so-what-if-it-is-an-object
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 2921
Proposed branch: lp:~jtv/maas/so-what-if-it-is-an-object
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 122 lines (+10/-10)
9 files modified
src/maasserver/fields.py (+1/-1)
src/maasserver/x509.py (+1/-1)
src/provisioningserver/boot/windows.py (+1/-1)
src/provisioningserver/cache.py (+2/-2)
src/provisioningserver/drivers/hardware/mscm.py (+1/-1)
src/provisioningserver/drivers/hardware/seamicro.py (+1/-1)
src/provisioningserver/drivers/hardware/tests/test_seamicro.py (+1/-1)
src/provisioningserver/drivers/hardware/ucsm.py (+1/-1)
src/provisioningserver/plugin.py (+1/-1)
To merge this branch: bzr merge lp:~jtv/maas/so-what-if-it-is-an-object
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+233616@code.launchpad.net

Commit message

No need for classes to inherit from object.

Description of the change

http://people.canonical.com/~jtv/object

Jeroen

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/fields.py'
2--- src/maasserver/fields.py 2014-08-27 18:56:30 +0000
3+++ src/maasserver/fields.py 2014-09-06 12:39:30 +0000
4@@ -418,7 +418,7 @@
5 return 'inet'
6
7
8-class LargeObjectFile(object):
9+class LargeObjectFile:
10 """Large object file.
11
12 Proxy the access from this object to psycopg2.
13
14=== modified file 'src/maasserver/x509.py'
15--- src/maasserver/x509.py 2014-08-13 21:49:35 +0000
16+++ src/maasserver/x509.py 2014-09-06 12:39:30 +0000
17@@ -39,7 +39,7 @@
18 """Error when generating x509 certificate."""
19
20
21-class WinRMX509(object):
22+class WinRMX509:
23 """Generates X509 certificates compatible with Windows WinRM."""
24
25 KEY_SIZE = 2048
26
27=== modified file 'src/provisioningserver/boot/windows.py'
28--- src/provisioningserver/boot/windows.py 2014-08-13 21:49:35 +0000
29+++ src/provisioningserver/boot/windows.py 2014-09-06 12:39:30 +0000
30@@ -76,7 +76,7 @@
31 return module.Hivex(*args, **kwargs)
32
33
34-class Bcd(object):
35+class Bcd:
36 """Allows modification of the load options in a Windows boot
37 configuration data file.
38
39
40=== modified file 'src/provisioningserver/cache.py'
41--- src/provisioningserver/cache.py 2013-10-07 09:12:40 +0000
42+++ src/provisioningserver/cache.py 2014-09-06 12:39:30 +0000
43@@ -1,4 +1,4 @@
44-# Copyright 2012 Canonical Ltd. This software is licensed under the
45+# Copyright 2012-2014 Canonical Ltd. This software is licensed under the
46 # GNU Affero General Public License version 3 (see the file LICENSE).
47
48 """API credentials for node-group workers."""
49@@ -21,7 +21,7 @@
50 from multiprocessing import Manager
51
52
53-class Cache(object):
54+class Cache:
55 """A process-safe dict-like cache."""
56
57 def __init__(self, cache_backend):
58
59=== modified file 'src/provisioningserver/drivers/hardware/mscm.py'
60--- src/provisioningserver/drivers/hardware/mscm.py 2014-07-03 20:08:45 +0000
61+++ src/provisioningserver/drivers/hardware/mscm.py 2014-09-06 12:39:30 +0000
62@@ -42,7 +42,7 @@
63 }
64
65
66-class MSCM_CLI_API(object):
67+class MSCM_CLI_API:
68 """An API for interacting with the Moonshot iLO CM CLI."""
69
70 def __init__(self, host, username, password):
71
72=== modified file 'src/provisioningserver/drivers/hardware/seamicro.py'
73--- src/provisioningserver/drivers/hardware/seamicro.py 2014-08-13 21:49:35 +0000
74+++ src/provisioningserver/drivers/hardware/seamicro.py 2014-09-06 12:39:30 +0000
75@@ -50,7 +50,7 @@
76 self.response_code = response_code
77
78
79-class SeaMicroAPIV09(object):
80+class SeaMicroAPIV09:
81 allowed_codes = [httplib.OK, httplib.ACCEPTED, httplib.NOT_MODIFIED]
82
83 def __init__(self, url):
84
85=== modified file 'src/provisioningserver/drivers/hardware/tests/test_seamicro.py'
86--- src/provisioningserver/drivers/hardware/tests/test_seamicro.py 2014-07-18 17:05:57 +0000
87+++ src/provisioningserver/drivers/hardware/tests/test_seamicro.py 2014-09-06 12:39:30 +0000
88@@ -44,7 +44,7 @@
89 import provisioningserver.utils as utils
90
91
92-class FakeResponse(object):
93+class FakeResponse:
94
95 def __init__(self, response_code, response, is_json=False):
96 self.response_code = response_code
97
98=== modified file 'src/provisioningserver/drivers/hardware/ucsm.py'
99--- src/provisioningserver/drivers/hardware/ucsm.py 2014-06-10 14:45:14 +0000
100+++ src/provisioningserver/drivers/hardware/ucsm.py 2014-09-06 12:39:30 +0000
101@@ -114,7 +114,7 @@
102 return doc
103
104
105-class UCSM_XML_API(object):
106+class UCSM_XML_API:
107 """Provides access to a Cisco UCS Manager's XML API. Public methods
108 on this class correspond to UCS Manager XML API methods.
109
110
111=== modified file 'src/provisioningserver/plugin.py'
112--- src/provisioningserver/plugin.py 2014-08-29 11:30:54 +0000
113+++ src/provisioningserver/plugin.py 2014-09-06 12:39:30 +0000
114@@ -194,7 +194,7 @@
115
116
117 @implementer(IServiceMaker, IPlugin)
118-class ProvisioningServiceMaker(object):
119+class ProvisioningServiceMaker:
120 """Create a service for the Twisted plugin."""
121
122 options = Options