I haven't read through every single litte one of the changes, but I'm
behind the concept. If it passes the tests, I'm pretty happy.
Reviewed-by: Daniel Axtens
Regards,
Daniel
Stephen Finucane writes:
> * Don't use 'str', 'id', 'max', etc. as variable names
> * Remove unnecessary use of six.range
> * Remove unnecessary use of six.map
>
> There is one paramter in xmlrpc that cannot be renamed as it could
> break some client code. noqa this instead.
>
> Signed-off-by: Stephen Finucane
> ---
> patchwork/filters.py | 73
> +++
> patchwork/models.py | 14
> patchwork/paginator.py| 1 -
> patchwork/parser.py | 9 +++--
> patchwork/templatetags/listurl.py | 14
> patchwork/templatetags/person.py | 4 +--
> patchwork/templatetags/syntax.py | 23 ++--
> patchwork/urls.py | 2 +-
> patchwork/views/bundle.py | 4 +--
> patchwork/views/help.py | 2 +-
> patchwork/views/patch.py | 14
> patchwork/views/xmlrpc.py | 2 +-
> 12 files changed, 77 insertions(+), 85 deletions(-)
>
> diff --git a/patchwork/filters.py b/patchwork/filters.py
> index 5650014..bea4340 100644
> --- a/patchwork/filters.py
> +++ b/patchwork/filters.py
> @@ -55,10 +55,13 @@ class Filter(object):
> that user's delegated patches"""
> pass
>
> -def parse(self, dict):
> -if self.param not in dict:
> +def _set_key(self, key):
> +raise NotImplementedError
> +
> +def parse(self, values):
> +if self.param not in values:
> return
> -self._set_key(dict[self.param])
> +self._set_key(values[self.param])
>
> def url_without_me(self):
> return self.filters.querystring_without_filter(self)
> @@ -89,34 +92,29 @@ class SubmitterFilter(Filter):
> self.person = None
> self.person_match = None
>
> -def _set_key(self, str):
> +def _set_key(self, key):
> self.person = None
> self.person_match = None
> submitter_id = None
>
> -str = str.strip()
> -if str == '':
> +key = key.strip()
> +if not key:
> return
>
> try:
> -submitter_id = int(str)
> +submitter_id = int(key)
> except ValueError:
> pass
> -except:
> -return
>
> if submitter_id:
> -self.person = Person.objects.get(id=int(str))
> +self.person = Person.objects.get(id=submitter_id)
> self.applied = True
> return
>
> -people = Person.objects.filter(name__icontains=str)
> -
> -if not people:
> -return
> -
> -self.person_match = str
> -self.applied = True
> +people = Person.objects.filter(name__icontains=key)
> +if people:
> +self.person_match = key
> +self.applied = True
>
> def kwargs(self):
> if self.person:
> @@ -158,16 +156,16 @@ class StateFilter(Filter):
> self.state = None
> self.applied = True
>
> -def _set_key(self, str):
> +def _set_key(self, key):
> self.state = None
>
> -if str == self.any_key:
> +if key == self.any_key:
> self.applied = False
> return
>
> try:
> -self.state = State.objects.get(id=int(str))
> -except:
> +self.state = State.objects.get(id=int(key))
> +except ValueError, State.DoesNotExist:
> return
>
> self.applied = True
> @@ -193,17 +191,17 @@ class StateFilter(Filter):
> return None
>
> def _form(self):
> -str = '' % self.param
> +out = '' % self.param
>
> selected = ''
> if not self.applied:
> selected = 'selected'
> -str += 'any' % (selected,
> self.any_key)
> +out += 'any' % (selected,
> self.any_key)
>
> selected = ''
> if self.applied and self.state is None:
> selected = 'selected'
> -str += '%s' % (
> +out += '%s' % (
> selected, self.action_req_str)
>
> for state in State.objects.all():
> @@ -211,10 +209,10 @@ class StateFilter(Filter):
> if self.state and self.state == state:
> selected = ' selected="true"'
>
> -str += '%s' % (
> +out += '%s' % (
> state.id, selected, state.name)
> -str += ''
> -return mark_safe(str)
> +out += ''
> +return mark_safe(out)
>
> def form_function(self):
> return 'function(form) { return form.x.value }'
> @@ -235,11 +233,12 @@ class SearchFilter(Filter):
> self.param = 'q'
> self.search = None
>
> -def _set_key(self, str):
> -str = str.strip()
> -if str == '':
> +
