Skip to content

Commit 73fb88e

Browse files
author
Dean Troyer
committed
Make entry point strings readable
PEP8 E126 wants continued strings to line up vertically, totally destroying the readability and visual indication of the beginning of a string in a list * Ignore PEP8 E126 in order to indent the entry point strings in a readable manner. * Sort the enrty point command strings by object then verb. * Bring other ignores from run_tests.sh to tox.ini Change-Id: I2593de7d6c058322101bc68636317cdba29fe664
1 parent b175184 commit 73fb88e

3 files changed

Lines changed: 125 additions & 105 deletions

File tree

‎run_tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ function run_pep8 {
118118
# other than what the PEP8 tool claims. It is deprecated in Python 3, so,
119119
# perhaps the mistake was thinking that the deprecation applied to Python 2
120120
# as well.
121-
pep8_opts="--ignore=E202,W602 --repeat"
121+
pep8_opts="--ignore=E126,E202,W602 --repeat"
122122
${wrapper} pep8 ${pep8_opts} ${srcfiles}
123123
}
124124

‎setup.py‎

Lines changed: 123 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -57,162 +57,182 @@ def read(fname):
5757
'openstack.cli': [
5858
],
5959
'openstack.identity.v2_0': [
60-
'create_endpoint=' +
61-
'openstackclient.identity.v2_0.endpoint:CreateEndpoint',
62-
'delete_endpoint=' +
63-
'openstackclient.identity.v2_0.endpoint:DeleteEndpoint',
64-
'list_endpoint=' +
65-
'openstackclient.identity.v2_0.endpoint:ListEndpoint',
66-
'show_endpoint=' +
67-
'openstackclient.identity.v2_0.endpoint:ShowEndpoint',
68-
'add_role=' +
69-
'openstackclient.identity.v2_0.role:AddRole',
70-
'create_role=' +
71-
'openstackclient.identity.v2_0.role:CreateRole',
72-
'delete_role=' +
73-
'openstackclient.identity.v2_0.role:DeleteRole',
60+
'create_endpoint='
61+
'openstackclient.identity.v2_0.endpoint:CreateEndpoint',
62+
'delete_endpoint='
63+
'openstackclient.identity.v2_0.endpoint:DeleteEndpoint',
64+
'list_endpoint='
65+
'openstackclient.identity.v2_0.endpoint:ListEndpoint',
66+
'show_endpoint='
67+
'openstackclient.identity.v2_0.endpoint:ShowEndpoint',
68+
69+
'add_role='
70+
'openstackclient.identity.v2_0.role:AddRole',
71+
'create_role='
72+
'openstackclient.identity.v2_0.role:CreateRole',
73+
'delete_role='
74+
'openstackclient.identity.v2_0.role:DeleteRole',
7475
'list_role=openstackclient.identity.v2_0.role:ListRole',
75-
'remove_role=' +
76-
'openstackclient.identity.v2_0.role:RemoveRole',
76+
'remove_role='
77+
'openstackclient.identity.v2_0.role:RemoveRole',
7778
'show_role=openstackclient.identity.v2_0.role:ShowRole',
78-
'create_service=' +
79-
'openstackclient.identity.v2_0.service:CreateService',
80-
'delete_service=' +
81-
'openstackclient.identity.v2_0.service:DeleteService',
79+
80+
'create_service='
81+
'openstackclient.identity.v2_0.service:CreateService',
82+
'delete_service='
83+
'openstackclient.identity.v2_0.service:DeleteService',
8284
'list_service=openstackclient.identity.v2_0.service:ListService',
8385
'show_service=openstackclient.identity.v2_0.service:ShowService',
84-
'create_tenant=' +
85-
'openstackclient.identity.v2_0.tenant:CreateTenant',
86-
'delete_tenant=' +
87-
'openstackclient.identity.v2_0.tenant:DeleteTenant',
86+
87+
'create_tenant='
88+
'openstackclient.identity.v2_0.tenant:CreateTenant',
89+
'delete_tenant='
90+
'openstackclient.identity.v2_0.tenant:DeleteTenant',
8891
'list_tenant=openstackclient.identity.v2_0.tenant:ListTenant',
8992
'set_tenant=openstackclient.identity.v2_0.tenant:SetTenant',
9093
'show_tenant=openstackclient.identity.v2_0.tenant:ShowTenant',
94+
9195
'list_user-role=openstackclient.identity.v2_0.role:ListUserRole',
92-
'create_user=' +
93-
'openstackclient.identity.v2_0.user:CreateUser',
94-
'delete_user=' +
95-
'openstackclient.identity.v2_0.user:DeleteUser',
96+
97+
'create_user='
98+
'openstackclient.identity.v2_0.user:CreateUser',
99+
'delete_user='
100+
'openstackclient.identity.v2_0.user:DeleteUser',
96101
'list_user=openstackclient.identity.v2_0.user:ListUser',
97102
'set_user=openstackclient.identity.v2_0.user:SetUser',
98103
'show_user=openstackclient.identity.v2_0.user:ShowUser',
99104
],
100105
'openstack.identity.v3': [
106+
'create_credential='
107+
'openstackclient.identity.v3.credential:CreateCredential',
108+
'delete_credential='
109+
'openstackclient.identity.v3.credential:DeleteCredential',
110+
'list_credential='
111+
'openstackclient.identity.v3.credential:ListCredential',
112+
'set_credential='
113+
'openstackclient.identity.v3.credential:SetCredential',
114+
'show_credential='
115+
'openstackclient.identity.v3.credential:ShowCredential',
116+
117+
'create_domain=openstackclient.identity.v3.domain:CreateDomain',
118+
'delete_domain=openstackclient.identity.v3.domain:DeleteDomain',
119+
'list_domain=openstackclient.identity.v3.domain:ListDomain',
120+
'set_domain=openstackclient.identity.v3.domain:SetDomain',
121+
'show_domain=openstackclient.identity.v3.domain:ShowDomain',
122+
123+
'create_endpoint='
124+
'openstackclient.identity.v3.endpoint:CreateEndpoint',
125+
'delete_endpoint='
126+
'openstackclient.identity.v3.endpoint:DeleteEndpoint',
127+
'set_endpoint=openstackclient.identity.v3.endpoint:SetEndpoint',
128+
'show_endpoint=openstackclient.identity.v3.endpoint:ShowEndpoint',
129+
'list_endpoint=openstackclient.identity.v3.endpoint:ListEndpoint',
130+
101131
'create_group=openstackclient.identity.v3.group:CreateGroup',
102132
'delete_group=openstackclient.identity.v3.group:DeleteGroup',
133+
'list_group=openstackclient.identity.v3.group:ListGroup',
103134
'set_group=openstackclient.identity.v3.group:SetGroup',
104135
'show_group=openstackclient.identity.v3.group:ShowGroup',
105-
'list_group=openstackclient.identity.v3.group:ListGroup',
106-
'create_project=' +
107-
'openstackclient.identity.v3.project:CreateProject',
108-
'delete_project=' +
109-
'openstackclient.identity.v3.project:DeleteProject',
136+
137+
'create_project='
138+
'openstackclient.identity.v3.project:CreateProject',
139+
'delete_project='
140+
'openstackclient.identity.v3.project:DeleteProject',
141+
'list_project=openstackclient.identity.v3.project:ListProject',
110142
'set_project=openstackclient.identity.v3.project:SetProject',
111143
'show_project=openstackclient.identity.v3.project:ShowProject',
112-
'list_project=openstackclient.identity.v3.project:ListProject',
113-
'create_user=' +
114-
'openstackclient.identity.v3.user:CreateUser',
115-
'delete_user=' +
116-
'openstackclient.identity.v3.user:DeleteUser',
117-
'list_user=openstackclient.identity.v3.user:ListUser',
118-
'set_user=openstackclient.identity.v3.user:SetUser',
119-
'show_user=openstackclient.identity.v3.user:ShowUser',
120-
'create_credential=' +
121-
'openstackclient.identity.v3.credential:CreateCredential',
122-
'delete_credential=' +
123-
'openstackclient.identity.v3.credential:DeleteCredential',
124-
'set_credential=' +
125-
'openstackclient.identity.v3.credential:SetCredential',
126-
'show_credential=' +
127-
'openstackclient.identity.v3.credential:ShowCredential',
128-
'list_credential=' +
129-
'openstackclient.identity.v3.credential:ListCredential',
130-
'create_domain=openstackclient.identity.v3.domain:CreateDomain',
131-
'delete_domain=openstackclient.identity.v3.domain:DeleteDomain',
132-
'set_domain=openstackclient.identity.v3.domain:SetDomain',
133-
'show_domain=openstackclient.identity.v3.domain:ShowDomain',
134-
'list_domain=openstackclient.identity.v3.domain:ListDomain',
135-
'create_role=' +
136-
'openstackclient.identity.v3.role:CreateRole',
137-
'delete_role=' +
138-
'openstackclient.identity.v3.role:DeleteRole',
144+
145+
'add_role=openstackclient.identity.v3.role:AddRole',
146+
'create_role='
147+
'openstackclient.identity.v3.role:CreateRole',
148+
'delete_role='
149+
'openstackclient.identity.v3.role:DeleteRole',
139150
'list_role=openstackclient.identity.v3.role:ListRole',
140151
'show_role=openstackclient.identity.v3.role:ShowRole',
141152
'set_role=openstackclient.identity.v3.role:SetRole',
142-
'add_role=openstackclient.identity.v3.role:AddRole',
143-
'create_service=' +
144-
'openstackclient.identity.v3.service:CreateService',
145-
'delete_service=' +
146-
'openstackclient.identity.v3.service:DeleteService',
153+
154+
'create_service='
155+
'openstackclient.identity.v3.service:CreateService',
156+
'delete_service='
157+
'openstackclient.identity.v3.service:DeleteService',
147158
'list_service=openstackclient.identity.v3.service:ListService',
148159
'show_service=openstackclient.identity.v3.service:ShowService',
149160
'set_service=openstackclient.identity.v3.service:SetService',
150-
'create_endpoint=' +
151-
'openstackclient.identity.v3.endpoint:CreateEndpoint',
152-
'delete_endpoint=' +
153-
'openstackclient.identity.v3.endpoint:DeleteEndpoint',
154-
'set_endpoint=openstackclient.identity.v3.endpoint:SetEndpoint',
155-
'show_endpoint=openstackclient.identity.v3.endpoint:ShowEndpoint',
156-
'list_endpoint=openstackclient.identity.v3.endpoint:ListEndpoint',
161+
162+
'create_user='
163+
'openstackclient.identity.v3.user:CreateUser',
164+
'delete_user='
165+
'openstackclient.identity.v3.user:DeleteUser',
166+
'list_user=openstackclient.identity.v3.user:ListUser',
167+
'set_user=openstackclient.identity.v3.user:SetUser',
168+
'show_user=openstackclient.identity.v3.user:ShowUser',
157169
],
158170
'openstack.image.v2': [
159171
'list_image=openstackclient.image.v2.image:ListImage',
160-
'show_image=openstackclient.image.v2.image:ShowImage',
161172
'save_image=openstackclient.image.v2.image:SaveImage',
173+
'show_image=openstackclient.image.v2.image:ShowImage',
162174
],
163175
'openstack.compute.v2': [
164176
'create_agent=openstackclient.compute.v2.agent:CreateAgent',
165-
'create_flavor=openstackclient.compute.v2.flavor:CreateFlavor',
166-
'create_server=openstackclient.compute.v2.server:CreateServer',
167177
'delete_agent=openstackclient.compute.v2.agent:DeleteAgent',
168-
'delete_flavor=openstackclient.compute.v2.flavor:DeleteFlavor',
169-
'delete_server=openstackclient.compute.v2.server:DeleteServer',
170178
'list_agent=openstackclient.compute.v2.agent:ListAgent',
179+
'set_agent=openstackclient.compute.v2.agent:SetAgent',
180+
181+
'list_compute-service='
182+
'openstackclient.compute.v2.service:ListService',
183+
'set_compute-service='
184+
'openstackclient.compute.v2.service:SetService',
185+
186+
'create_flavor=openstackclient.compute.v2.flavor:CreateFlavor',
187+
'delete_flavor=openstackclient.compute.v2.flavor:DeleteFlavor',
171188
'list_flavor=openstackclient.compute.v2.flavor:ListFlavor',
189+
'show_flavor=openstackclient.compute.v2.flavor:ShowFlavor',
190+
172191
'list_host=openstackclient.compute.v2.host:ListHost',
173-
'list_hypervisor=' +
174-
'openstackclient.compute.v2.hypervisor:ListHypervisor',
192+
'show_host=openstackclient.compute.v2.host:ShowHost',
193+
194+
'list_hypervisor='
195+
'openstackclient.compute.v2.hypervisor:ListHypervisor',
196+
'show_hypervisor='
197+
'openstackclient.compute.v2.hypervisor:ShowHypervisor',
198+
199+
'create_server=openstackclient.compute.v2.server:CreateServer',
200+
'delete_server=openstackclient.compute.v2.server:DeleteServer',
175201
'list_server=openstackclient.compute.v2.server:ListServer',
176-
'list_compute-service=' +
177-
'openstackclient.compute.v2.service:ListService',
178202
'pause_server=openstackclient.compute.v2.server:PauseServer',
179203
'reboot_server=openstackclient.compute.v2.server:RebootServer',
180204
'rebuild_server=openstackclient.compute.v2.server:RebuildServer',
181205
'resume_server=openstackclient.compute.v2.server:ResumeServer',
182-
'set_agent=openstackclient.compute.v2.agent:SetAgent',
183-
'set_compute-service=' +
184-
'openstackclient.compute.v2.service:SetService',
185-
'show_flavor=openstackclient.compute.v2.flavor:ShowFlavor',
186-
'show_host=openstackclient.compute.v2.host:ShowHost',
187-
'show_hypervisor=' +
188-
'openstackclient.compute.v2.hypervisor:ShowHypervisor',
189206
'show_server=openstackclient.compute.v2.server:ShowServer',
190207
'suspend_server=openstackclient.compute.v2.server:SuspendServer',
191208
'unpause_server=openstackclient.compute.v2.server:UnpauseServer',
192209
],
193210
'openstack.volume.v1': [
194-
'create_volume-type=' +
195-
'openstackclient.volume.v1.type:CreateVolumeType',
196-
'delete_volume-type=' +
197-
'openstackclient.volume.v1.type:DeleteVolumeType',
198-
'list_volume-type=openstackclient.volume.v1.type:ListVolumeType',
199-
'set_volume-type=openstackclient.volume.v1.type:SetVolumeType',
200-
'unset_volume-type=openstackclient.volume.v1.type:UnsetVolumeType',
201-
'show_quota=openstackclient.volume.v1.quota:ShowQuota',
202211
'list_quota=openstackclient.volume.v1.quota:ListQuota',
203212
'set_quota=openstackclient.volume.v1.quota:SetQuota',
213+
'show_quota=openstackclient.volume.v1.quota:ShowQuota',
214+
215+
'create_snapshot='
216+
'openstackclient.volume.v1.snapshot:CreateSnapshot',
217+
'delete_snapshot='
218+
'openstackclient.volume.v1.snapshot:DeleteSnapshot',
219+
'list_snapshot=openstackclient.volume.v1.snapshot:ListSnapshot',
220+
'set_snapshot=openstackclient.volume.v1.snapshot:SetSnapshot',
221+
'show_snapshot=openstackclient.volume.v1.snapshot:ShowSnapshot',
222+
204223
'create_volume=openstackclient.volume.v1.volume:CreateVolume',
205224
'delete_volume=openstackclient.volume.v1.volume:DeleteVolume',
206225
'list_volume=openstackclient.volume.v1.volume:ListVolume',
207226
'set_volume=openstackclient.volume.v1.volume:SetVolume',
208227
'show_volume=openstackclient.volume.v1.volume:ShowVolume',
209-
'create_snapshot=' +
210-
'openstackclient.volume.v1.snapshot:CreateSnapshot',
211-
'delete_snapshot=' +
212-
'openstackclient.volume.v1.snapshot:DeleteSnapshot',
213-
'list_snapshot=openstackclient.volume.v1.snapshot:ListSnapshot',
214-
'set_snapshot=openstackclient.volume.v1.snapshot:SetSnapshot',
215-
'show_snapshot=openstackclient.volume.v1.snapshot:ShowSnapshot',
228+
229+
'create_volume-type='
230+
'openstackclient.volume.v1.type:CreateVolumeType',
231+
'delete_volume-type='
232+
'openstackclient.volume.v1.type:DeleteVolumeType',
233+
'list_volume-type=openstackclient.volume.v1.type:ListVolumeType',
234+
'set_volume-type=openstackclient.volume.v1.type:SetVolumeType',
235+
'unset_volume-type=openstackclient.volume.v1.type:UnsetVolumeType',
216236
]
217237
}
218238
)

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ commands = python setup.py testr --testr-args='{posargs}'
1212

1313
[testenv:pep8]
1414
deps = pep8==1.3.3
15-
commands = pep8 --repeat --show-source openstackclient setup.py
15+
commands = pep8 --ignore=E126,E202,W602 --repeat --show-source openstackclient setup.py
1616

1717
[testenv:venv]
1818
commands = {posargs}

0 commit comments

Comments
 (0)