From 01a15d7f0c939a08616104917a13731d57dc8140 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 13 Oct 2014 17:33:23 -0400 Subject: [PATCH] PEP8 cleanups --- .../management/commands/import_users.py | 5 ++-- mayan/apps/user_management/views.py | 30 +++++++++---------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/mayan/apps/user_management/management/commands/import_users.py b/mayan/apps/user_management/management/commands/import_users.py index 77de8c9c3e..669a54ec9d 100644 --- a/mayan/apps/user_management/management/commands/import_users.py +++ b/mayan/apps/user_management/management/commands/import_users.py @@ -80,6 +80,7 @@ class Command(LabelCommand): def _confirm(interactive): if not interactive: return 'yes' + return raw_input('You have requested to import a number of users from a CSV file.\n' - 'Are you sure you want to do this?\n' - 'Type \'yes\' to continue, or any other value to cancel: ') + 'Are you sure you want to do this?\n' + 'Type \'yes\' to continue, or any other value to cancel: ') diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index e64d2fa50f..5da1b1dabb 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -1,24 +1,25 @@ from __future__ import absolute_import +from django.conf import settings from django.contrib import messages from django.contrib.auth import get_user_model -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import Group, User from django.core.urlresolvers import reverse -from django.conf import settings from django.http import HttpResponseRedirect -from django.shortcuts import render_to_response, get_object_or_404 +from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ -from common.utils import generate_choices_w_labels, encapsulate +from common.utils import encapsulate, generate_choices_w_labels from common.views import assign_remove from common.widgets import two_state_template from permissions.models import Permission -from .forms import UserForm, PasswordForm, GroupForm -from .permissions import (PERMISSION_USER_CREATE, PERMISSION_USER_EDIT, - PERMISSION_USER_VIEW, PERMISSION_USER_DELETE, PERMISSION_GROUP_CREATE, - PERMISSION_GROUP_EDIT, PERMISSION_GROUP_VIEW, PERMISSION_GROUP_DELETE) +from .forms import GroupForm, PasswordForm, UserForm +from .permissions import (PERMISSION_GROUP_CREATE, PERMISSION_GROUP_DELETE, + PERMISSION_GROUP_EDIT, PERMISSION_GROUP_VIEW, + PERMISSION_USER_CREATE, PERMISSION_USER_DELETE, + PERMISSION_USER_EDIT, PERMISSION_USER_VIEW) def user_list(request): @@ -50,7 +51,7 @@ def user_list(request): } return render_to_response('main/generic_list.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def user_edit(request, user_id): @@ -143,7 +144,7 @@ def user_delete(request, user_id=None, user_id_list=None): context['title'] = _(u'Are you sure you wish to delete the users: %s?') % ', '.join([unicode(d) for d in users]) return render_to_response('main/generic_confirm.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def user_multiple_delete(request): @@ -205,7 +206,7 @@ def user_set_password(request, user_id=None, user_id_list=None): context['title'] = _(u'Reseting password for users: %s') % ', '.join([unicode(d) for d in users]) return render_to_response('main/generic_form.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def user_multiple_set_password(request): @@ -260,7 +261,7 @@ def group_list(request): } return render_to_response('main/generic_list.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def group_edit(request, group_id): @@ -281,8 +282,7 @@ def group_edit(request, group_id): 'form': form, 'object': group, 'object_name': _(u'Group'), - }, - context_instance=RequestContext(request)) + }, context_instance=RequestContext(request)) def group_add(request): @@ -345,7 +345,7 @@ def group_delete(request, group_id=None, group_id_list=None): context['title'] = _(u'Are you sure you wish to delete the groups: %s?') % ', '.join([unicode(d) for d in groups]) return render_to_response('main/generic_confirm.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def group_multiple_delete(request):