openstack
/
horizon
Code Issues Proposed changes

Corrections for stricter pep8 checking. 

Updates the code to reflect stricter pep8 checking standards
for pep8 1.3+. Also adds a pep8 config file to silence
unnecessary indentation errors.

Removes the "reverse bugfix" monkeypatch since Django 1.4 is
now required.

Implements blueprint upgrade-pep8.

Change-Id: I7343321627d8ccd1598f39323821133168a645cc
This commit is contained in:
Gabriel Hurley 2012-06-23 13:06:11 -07:00
parent 7ce7905518
commit 820fdfe868
20 changed files with 76 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.pep8 Normal file
View File

@ -0,0 +1,4 @@
[pep8]
ignore = E121,E126,E127,E128,W602
exclude = vcsversion.py,panel_template,dash_template,local_settings.py

5
horizon/__init__.py
View File

@ -39,11 +39,6 @@ except ImportError:
warnings.warn(msg, Warning)
if Horizon:
# This can be removed once the upstream bug is fixed.
import django
if django.VERSION < (1, 4):
from horizon.utils import reverse_bugfix
register = Horizon.register
unregister = Horizon.unregister
get_absolute_url = Horizon.get_absolute_url

37
horizon/api/nova.py
View File

@ -127,12 +127,12 @@ class Usage(APIResourceWrapper):
@property
def total_active_instances(self):
return sum(1 for s in self.server_usages if s['ended_at'] == None)
return sum(1 for s in self.server_usages if s['ended_at'] is None)
@property
def vcpus(self):
return sum(s['vcpus'] for s in self.server_usages
if s['ended_at'] == None)
if s['ended_at'] is None)
@property
def vcpu_hours(self):
@ -141,12 +141,12 @@ class Usage(APIResourceWrapper):
@property
def local_gb(self):
return sum(s['local_gb'] for s in self.server_usages
if s['ended_at'] == None)
if s['ended_at'] is None)
@property
def memory_mb(self):
return sum(s['memory_mb'] for s in self.server_usages
if s['ended_at'] == None)
if s['ended_at'] is None)
@property
def disk_gb_hours(self):
@ -164,8 +164,8 @@ class SecurityGroup(APIResourceWrapper):
"""Wraps transmitted rule info in the novaclient rule class."""
if "_rules" not in self.__dict__:
manager = nova_rules.SecurityGroupRuleManager
self._rules = [nova_rules.SecurityGroupRule(manager, rule) for \
rule in self._apiresource.rules]
self._rules = [nova_rules.SecurityGroupRule(manager, rule)
for rule in self._apiresource.rules]
return self.__dict__['_rules']
@rules.setter
@ -310,8 +310,8 @@ def server_list(request, search_opts=None, all_tenants=False):
search_opts['all_tenants'] = True
else:
search_opts['project_id'] = request.user.tenant_id
return [Server(s, request) for s in novaclient(request).\
servers.list(True, search_opts)]
return [Server(s, request)
for s in novaclient(request).servers.list(True, search_opts)]
def server_console_output(request, instance_id, tail_length=None):
@ -439,18 +439,17 @@ def tenant_quota_usages(request):
def security_group_list(request):
return [SecurityGroup(g) for g in novaclient(request).\
security_groups.list()]
return [SecurityGroup(g) for g
in novaclient(request).security_groups.list()]
def security_group_get(request, security_group_id):
return SecurityGroup(novaclient(request).\
security_groups.get(security_group_id))
def security_group_get(request, sg_id):
return SecurityGroup(novaclient(request).security_groups.get(sg_id))
def security_group_create(request, name, description):
return SecurityGroup(novaclient(request).\
security_groups.create(name, description))
def security_group_create(request, name, desc):
return SecurityGroup(novaclient(request).security_groups.create(name,
desc))
def security_group_delete(request, security_group_id):
@ -460,13 +459,13 @@ def security_group_delete(request, security_group_id):
def security_group_rule_create(request, parent_group_id, ip_protocol=None,
from_port=None, to_port=None, cidr=None,
group_id=None):
return SecurityGroupRule(novaclient(request).\
security_group_rules.create(parent_group_id,
sg = novaclient(request).security_group_rules.create(parent_group_id,
ip_protocol,
from_port,
to_port,
cidr,
group_id))
group_id)
return SecurityGroupRule(sg)
def security_group_rule_delete(request, security_group_rule_id):

12
horizon/api/swift.py
View File

@ -117,11 +117,13 @@ def swift_filter_objects(request, filter_string, container_name, prefix=None,
path=path)
filter_string_list = filter_string.lower().strip().split(' ')
return filter(lambda obj: any([
obj.content_type != "application/directory"
and wildcard_search(obj.name.lower(), q)
for q in filter_string_list if q != ''
]), objects)
def matches_filter(obj):
if obj.content_type == "application/directory":
return False
for q in filter_string_list:
return wildcard_search(obj.name.lower(), q)
return filter(matches_filter, objects)
def wildcard_search(string, q):

12
horizon/dashboards/nova/access_and_security/security_groups/forms.py
View File

@ -112,10 +112,10 @@ class AddRule(forms.SelfHandlingForm):
source_group = cleaned_data.get("source_group", None)
if ip_proto == 'icmp':
if from_port == None:
if from_port is None:
msg = _('The ICMP type is invalid.')
raise ValidationError(msg)
if to_port == None:
if to_port is None:
msg = _('The ICMP code is invalid.')
raise ValidationError(msg)
if from_port not in xrange(-1, 256):
@ -125,10 +125,10 @@ class AddRule(forms.SelfHandlingForm):
msg = _('The ICMP code not in range (-1, 255)')
raise ValidationError(msg)
else:
if from_port == None:
if from_port is None:
msg = _('The "from" port number is invalid.')
raise ValidationError(msg)
if to_port == None:
if to_port is None:
msg = _('The "to" port number is invalid.')
raise ValidationError(msg)
if to_port < from_port:
@ -159,8 +159,8 @@ class AddRule(forms.SelfHandlingForm):
data['to_port'],
data['cidr'],
data['source_group'])
messages.success(request, _('Successfully added rule: %s') \
% unicode(rule))
messages.success(request,
_('Successfully added rule: %s') % unicode(rule))
except:
exceptions.handle(request,
_('Unable to add rule to security group.'))

5
horizon/dashboards/nova/images_and_snapshots/images/tables.py
View File

@ -105,8 +105,9 @@ class ImagesTable(tables.DataTable):
("killed", False),
("deleted", False),
)
name = tables.Column("name", link="horizon:nova:images_and_snapshots:" \
"images:detail",
name = tables.Column("name",
link=("horizon:nova:images_and_snapshots:"
"images:detail"),
verbose_name=_("Image Name"))
image_type = tables.Column(get_image_type,
verbose_name=_("Type"),

3
horizon/dashboards/nova/images_and_snapshots/images/tests.py
View File

@ -48,8 +48,7 @@ class ImageViewTests(test.TestCase):
'minimum_disk': 15,
'minimum_ram': 512,
'is_public': 1,
'method': 'CreateImageForm'
}
'method': 'CreateImageForm'}
api.glance.image_create(IsA(http.HttpRequest),
container_format="bare",

5
horizon/dashboards/nova/instances_and_volumes/instances/tables.py
View File

@ -255,8 +255,9 @@ class InstancesTable(tables.DataTable):
TASK_DISPLAY_CHOICES = (
("image_snapshot", "Snapshotting"),
)
name = tables.Column("name", link="horizon:nova:instances_and_volumes:" \
"instances:detail",
name = tables.Column("name",
link=("horizon:nova:instances_and_volumes:"
"instances:detail"),
verbose_name=_("Instance Name"))
ip = tables.Column(get_ips, verbose_name=_("IP Address"))
size = tables.Column(get_size, verbose_name=_("Size"))

4
horizon/dashboards/nova/instances_and_volumes/instances/workflows.py
View File

@ -109,7 +109,7 @@ class VolumeOptionsAction(workflows.Action):
def populate_volume_id_choices(self, request, context):
volume_options = [("", _("Select Volume"))]
try:
volumes = [v for v in api.nova.volume_list(self.request) \
volumes = [v for v in api.nova.volume_list(self.request)
if v.status == api.VOLUME_STATE_AVAILABLE]
volume_options.extend([self._get_volume_display_name(vol)
for vol in volumes])
@ -122,7 +122,7 @@ class VolumeOptionsAction(workflows.Action):
volume_options = [("", _("Select Volume Snapshot"))]
try:
snapshots = api.nova.volume_snapshot_list(self.request)
snapshots = [s for s in snapshots \
snapshots = [s for s in snapshots
if s.status == api.VOLUME_STATE_AVAILABLE]
volume_options.extend([self._get_volume_display_name(snap)
for snap in snapshots])

4
horizon/dashboards/nova/instances_and_volumes/views.py
View File

@ -54,8 +54,8 @@ class IndexView(tables.MultiTableView):
if instances:
try:
flavors = api.flavor_list(self.request)
full_flavors = SortedDict([(str(flavor.id), flavor) for \
flavor in flavors])
full_flavors = SortedDict([(str(flavor.id), flavor)
for flavor in flavors])
for instance in instances:
flavor_id = instance.flavor["id"]
instance.full_flavor = full_flavors[flavor_id]

11
horizon/dashboards/nova/instances_and_volumes/volumes/tests.py
View File

@ -64,9 +64,8 @@ class VolumeViewTests(test.TestCase):
args=[volume.id])
res = self.client.get(url)
self.assertEqual(res.context['form'].\
fields['instance']._choices[0][1],
"Select an instance")
self.assertEqual(res.context['form'].fields['instance']._choices[0][1],
"Select an instance")
self.assertEqual(len(res.context['form'].fields['instance'].choices),
2)
self.assertEqual(res.context['form'].fields['instance']._choices[1][0],
@ -90,8 +89,10 @@ class VolumeViewTests(test.TestCase):
res = self.client.get(url)
self.assertContains(res, "<dd>Volume name</dd>", 1, 200)
self.assertContains(res, "<dd>41023e92-8008-4c8b-8059-" \
"7f2293ff3775</dd>", 1, 200)
self.assertContains(res,
"<dd>41023e92-8008-4c8b-8059-7f2293ff3775</dd>",
1,
200)
self.assertContains(res, "<dd>Available</dd>", 1, 200)
self.assertContains(res, "<dd>40 GB</dd>", 1, 200)
self.assertContains(res, "<a href=\"/nova/instances_and_volumes/"

5
horizon/dashboards/syspanel/instances/tables.py
View File

@ -68,8 +68,9 @@ class SyspanelInstancesTable(tables.DataTable):
host = tables.Column("OS-EXT-SRV-ATTR:host",
verbose_name=_("Host"),
classes=('nowrap-col',))
name = tables.Column("name", link="horizon:nova:instances_and_volumes:" \
"instances:detail",
name = tables.Column("name",
link=("horizon:nova:instances_and_volumes:"
"instances:detail"),
verbose_name=_("Instance Name"))
ip = tables.Column(get_ips, verbose_name=_("IP Address"))
size = tables.Column(get_size,

22
horizon/dashboards/syspanel/projects/forms.py
View File

@ -119,19 +119,19 @@ class UpdateQuotas(forms.SelfHandlingForm):
floating_ips = forms.IntegerField(label=_("Floating IPs"))
def handle(self, request, data):
ifcb = data['injected_file_content_bytes']
try:
api.nova.tenant_quota_update(request,
data['tenant_id'],
metadata_items=data['metadata_items'],
injected_file_content_bytes=data['injected_file_content_bytes'],
volumes=data['volumes'],
gigabytes=data['gigabytes'],
ram=data['ram'],
floating_ips=data['floating_ips'],
instances=data['instances'],
injected_files=data['injected_files'],
cores=data['cores'],
)
data['tenant_id'],
metadata_items=data['metadata_items'],
injected_file_content_bytes=ifcb,
volumes=data['volumes'],
gigabytes=data['gigabytes'],
ram=data['ram'],
floating_ips=data['floating_ips'],
instances=data['instances'],
injected_files=data['injected_files'],
cores=data['cores'])
messages.success(request,
_('Quotas for %s were successfully updated.')
% data['tenant_id'])

2
horizon/dashboards/syspanel/users/forms.py
View File

@ -128,7 +128,7 @@ class UpdateUserForm(BaseUserForm):
def __init__(self, request, *args, **kwargs):
super(UpdateUserForm, self).__init__(request, *args, **kwargs)
if api.keystone_can_edit_user() == False:
if api.keystone_can_edit_user() is False:
for field in ('name', 'email', 'password', 'confirm_password'):
self.fields.pop(field)

2
horizon/tables/base.py
View File

@ -751,7 +751,7 @@ class DataTableMetaclass(type):
# (list() call gives deterministic sort order, which sets don't have.)
actions = list(set(opts.row_actions) | set(opts.table_actions))
actions.sort(key=attrgetter('name'))
actions_dict = SortedDict([(action.name, action()) \
actions_dict = SortedDict([(action.name, action())
for action in actions])
attrs['base_actions'] = actions_dict
if opts._filter_action:

3
horizon/tests/api_tests/nova_tests.py
View File

@ -198,5 +198,4 @@ class ComputeApiTests(test.APITestCase):
'floating_ips': {'available': -1,
'used': 2,
'flavor_fields': [],
'quota': 1}
})
'quota': 1}})

8
horizon/tests/testsettings.py
View File

@ -128,17 +128,17 @@ LOGGING = {
'null': {
'level': 'DEBUG',
'class': 'django.utils.log.NullHandler',
},
},
'test': {
'level': 'DEBUG',
'class': 'logging.StreamHandler',
}
},
}
},
'loggers': {
'django.db.backends': {
'handlers': ['null'],
'propagate': False,
},
},
'horizon': {
'handlers': ['test'],
'propagate': False,

183
horizon/utils/reverse_bugfix.py
View File

@ -1,183 +0,0 @@
"""
Bugfix for issue #15900: https://code.djangoproject.com/ticket/15900.
This code is largely reproduced from
https://code.djangoproject.com/browser/django/trunk/django/core/urlresolvers.py
and is the work of Django's authors:
https://code.djangoproject.com/browser/django/trunk/AUTHORS
It is licensed under Django's BSD license, available here:
https://code.djangoproject.com/browser/django/trunk/LICENSE
To use, simply import this code in your project's root URLconf file before
defining any URL patterns.
"""
from django.core import urlresolvers
if not hasattr(urlresolvers.RegexURLResolver, "_reverse_with_prefix"):
import re
from django.conf import urls
from django.utils.datastructures import MultiValueDict
from django.utils.encoding import iri_to_uri, force_unicode
from django.utils.regex_helper import normalize
def _populate(self):
lookups = MultiValueDict()
namespaces = {}
apps = {}
for pattern in reversed(self.url_patterns):
p_pattern = pattern.regex.pattern
if p_pattern.startswith('^'):
p_pattern = p_pattern[1:]
if isinstance(pattern, urlresolvers.RegexURLResolver):
if pattern.namespace:
namespaces[pattern.namespace] = (p_pattern, pattern)
if pattern.app_name:
apps.setdefault(pattern.app_name, []) \
.append(pattern.namespace)
else:
parent = normalize(pattern.regex.pattern)
for name in pattern.reverse_dict:
for matches, pat, defaults in \
pattern.reverse_dict.getlist(name):
new_matches = []
for piece, p_args in parent:
vals = [(piece + suffix, p_args + args) for \
(suffix, args) in matches]
new_matches.extend(vals)
lookup_list = (new_matches, p_pattern + pat,
dict(defaults,
**pattern.default_kwargs))
lookups.appendlist(name, lookup_list)
for namespace, (prefix, sub_pattern) in \
pattern.namespace_dict.items():
namespace_vals = (p_pattern + prefix, sub_pattern)
namespaces[namespace] = namespace_vals
for app_name, namespace_list in pattern.app_dict.items():
apps.setdefault(app_name, []).extend(namespace_list)
else:
bits = normalize(p_pattern)
lookup_list = (bits, p_pattern, pattern.default_args)
lookups.appendlist(pattern.callback, lookup_list)
if pattern.name is not None:
lookup_list = (bits, p_pattern, pattern.default_args)
lookups.appendlist(pattern.name, lookup_list)
self._reverse_dict = lookups
self._namespace_dict = namespaces
self._app_dict = apps
def resolver_reverse(self, lookup_view, *args, **kwargs):
return self._reverse_with_prefix(lookup_view, '', *args, **kwargs)
def _reverse_with_prefix(self, lookup_view, _prefix, *args, **kwargs):
if args and kwargs:
raise ValueError("Don't mix *args and **kwargs in call to "
"reverse()!")
try:
lookup_view = urlresolvers.get_callable(lookup_view, True)
except (ImportError, AttributeError), e:
raise urlresolvers.NoReverseMatch("Error importing '%s': %s."
% (lookup_view, e))
possibilities = self.reverse_dict.getlist(lookup_view)
prefix_norm, prefix_args = normalize(_prefix)[0]
for possibility, pattern, defaults in possibilities:
for result, params in possibility:
if args:
if len(args) != len(params) + len(prefix_args):
continue
unicode_args = [force_unicode(val) for val in args]
candidate = (prefix_norm + result) \
% dict(zip(prefix_args + params, unicode_args))
else:
if set(kwargs.keys() + defaults.keys()) != \
set(params + defaults.keys() + prefix_args):
continue
matches = True
for k, v in defaults.items():
if kwargs.get(k, v) != v:
matches = False
break
if not matches:
continue
unicode_kwargs = dict([(k, force_unicode(v)) for \
(k, v) in kwargs.items()])
candidate = (prefix_norm + result) % unicode_kwargs
if re.search(u'^%s%s' % (_prefix, pattern),
candidate, re.UNICODE):
return candidate
# lookup_view can be URL label, or dotted path, or callable, Any of
# these can be passed in at the top, but callables are not friendly in
# error messages.
m = getattr(lookup_view, '__module__', None)
n = getattr(lookup_view, '__name__', None)
if m is not None and n is not None:
lookup_view_s = "%s.%s" % (m, n)
else:
lookup_view_s = lookup_view
raise urlresolvers.NoReverseMatch("Reverse for '%s' with "
"arguments '%s' and keyword "
"arguments '%s' not found."
% (lookup_view_s, args, kwargs))
def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None,
current_app=None):
if urlconf is None:
urlconf = urlresolvers.get_urlconf()
resolver = urlresolvers.get_resolver(urlconf)
args = args or []
kwargs = kwargs or {}
if prefix is None:
prefix = urlresolvers.get_script_prefix()
if not isinstance(viewname, basestring):
view = viewname
else:
parts = viewname.split(':')
parts.reverse()
view = parts[0]
path = parts[1:]
resolved_path = []
while path:
ns = path.pop()
# Lookup the name to see if it could be an app identifier
try:
app_list = resolver.app_dict[ns]
# Yes! Path part matches an app in the current Resolver
if current_app and current_app in app_list:
# If we are reversing for a particular app,
# use that namespace
ns = current_app
elif ns not in app_list:
# The name isn't shared by one of the instances
# (i.e., the default) so just pick the first instance
# as the default.
ns = app_list[0]
except KeyError:
pass
try:
extra, resolver = resolver.namespace_dict[ns]
resolved_path.append(ns)
prefix = prefix + extra
except KeyError, key:
if resolved_path:
raise urlresolvers.NoReverseMatch("%s is not a "
"registered namespace inside %s'"
% (key, ':'.join(resolved_path)))
else:
raise urlresolvers.NoReverseMatch("%s is not a "
"registered "
"namespace" % key)
return iri_to_uri(resolver._reverse_with_prefix(view, prefix,
*args, **kwargs))
urlresolvers.RegexURLResolver._populate = _populate
urlresolvers.RegexURLResolver.reverse = resolver_reverse
urlresolvers.RegexURLResolver._reverse_with_prefix = _reverse_with_prefix
urlresolvers.reverse = reverse

7
run_tests.sh
View File

@ -6,7 +6,7 @@ set -o errexit
# Increment me any time the environment should be rebuilt.
# This includes dependncy changes, directory renames, etc.
# Simple integer secuence: 1, 2, 3...
environment_version=20
environment_version=21
#--------------------------------------------------------#
function usage {
@ -124,10 +124,7 @@ function run_pylint {
function run_pep8 {
echo "Running pep8 ..."
rm -f pep8.txt
PEP8_EXCLUDE=vcsversion.py,panel_template,dash_template
PEP8_IGNORE=W602
PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --ignore=$PEP8_IGNORE --repeat"
${command_wrapper} pep8 $PEP8_OPTIONS $included_dirs | perl -ple 's/: ([WE]\d+)/: [$1]/' > pep8.txt || true
${command_wrapper} pep8 $included_dirs | perl -ple 's/: ([WE]\d+)/: [$1]/' > pep8.txt || true
PEP8_COUNT=`wc -l pep8.txt | awk '{ print $1 }'`
if [ $PEP8_COUNT -ge 1 ]; then
echo "PEP8 violations found ($PEP8_COUNT):"

2
tools/test-requires
View File

@ -9,7 +9,7 @@ nose
nose-exclude
nosexcover
openstack.nose_plugin
pep8==1.1
pep8>=1.3
pylint
selenium