Merge lp://qastaging/~devcamcar/horizon/pep8-fixes into lp://qastaging/~hudson-openstack/horizon/trunk
Proposed by
Devin Carlen
| Status: | Merged |
|---|---|
| Approved by: | Devin Carlen |
| Approved revision: | 59 |
| Merged at revision: | 59 |
| Proposed branch: | lp://qastaging/~devcamcar/horizon/pep8-fixes |
| Merge into: | lp://qastaging/~hudson-openstack/horizon/trunk |
| Diff against target: |
1560 lines (+363/-294) 31 files modified
django-openstack/src/django_openstack/core/connection.py (+2/-6) django-openstack/src/django_openstack/management/commands/createnovausers.py (+1/-0) django-openstack/src/django_openstack/models.py (+4/-3) django-openstack/src/django_openstack/nova/exceptions.py (+0/-2) django-openstack/src/django_openstack/nova/forms.py (+28/-12) django-openstack/src/django_openstack/nova/manager.py (+34/-30) django-openstack/src/django_openstack/nova/shortcuts.py (+8/-5) django-openstack/src/django_openstack/nova/templatetags/region_tags.py (+0/-1) django-openstack/src/django_openstack/nova/tests/base.py (+0/-1) django-openstack/src/django_openstack/nova/tests/credential_tests.py (+2/-2) django-openstack/src/django_openstack/nova/tests/image_tests.py (+4/-2) django-openstack/src/django_openstack/nova/tests/instance_tests.py (+21/-20) django-openstack/src/django_openstack/nova/tests/keypair_tests.py (+2/-2) django-openstack/src/django_openstack/nova/tests/region_tests.py (+0/-2) django-openstack/src/django_openstack/nova/tests/volume_tests.py (+2/-1) django-openstack/src/django_openstack/nova/views/admin.py (+78/-62) django-openstack/src/django_openstack/nova/views/credentials.py (+2/-2) django-openstack/src/django_openstack/nova/views/images.py (+5/-6) django-openstack/src/django_openstack/nova/views/instances.py (+52/-40) django-openstack/src/django_openstack/nova/views/keypairs.py (+12/-8) django-openstack/src/django_openstack/nova/views/projects.py (+20/-16) django-openstack/src/django_openstack/nova/views/securitygroups.py (+35/-30) django-openstack/src/django_openstack/nova/views/volumes.py (+32/-27) django-openstack/src/django_openstack/templatetags/templatetags/admin_extras.py (+7/-4) django-openstack/src/django_openstack/templatetags/templatetags/django_openstack_tags.py (+1/-1) django-openstack/src/django_openstack/templatetags/templatetags/sidebar_tags.py (+4/-2) django-openstack/src/django_openstack/templatetags/templatetags/truncate_filter.py (+2/-1) django-openstack/src/django_openstack/testurls.py (+0/-1) openstack-dashboard/dashboard/settings.py (+1/-1) openstack-dashboard/dashboard/urls.py (+3/-3) openstack-dashboard/dashboard/views.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~devcamcar/horizon/pep8-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Devin Carlen | Pending | ||
|
Review via email:
|
|||
Description of the change
Lots of minor pep8 fixes
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
