Fix a bunch of PEP8 violations
This commit is contained in:
Jan Tuomi
+52
-32
@@ -11,13 +11,13 @@ import requests
|
||||
from django.conf import settings
|
||||
import logging
|
||||
|
||||
#Logger function, you can use the same idea when implementing other loggers to other apps
|
||||
# Logger function, you can use the same idea when implementing other loggers to other apps
|
||||
memberlogger = logging.getLogger(__name__)
|
||||
logging.basicConfig(format='[%(levelname)s]%(asctime)s %(message)s', level=settings.LOGGERLEVEL, filename=settings.LOGPATH)
|
||||
|
||||
|
||||
#function to validate reCaptcha
|
||||
def validateReCaptcha(response):
|
||||
# function to validate reCaptcha
|
||||
def validate_recaptcha(response):
|
||||
values = {
|
||||
'secret': settings.GOOGLE_RECAPTCHA_SECRET_KEY,
|
||||
'response': response,
|
||||
@@ -31,43 +31,49 @@ def validateReCaptcha(response):
|
||||
return False
|
||||
return True
|
||||
|
||||
#def sendmail(subject, message):
|
||||
#send_mail(
|
||||
# subject,
|
||||
# message,
|
||||
# 'no-reply@sahkoinsinoorikilta.fi',
|
||||
# ['viestintamestari@sahkoinsinoorikilta.fi'],
|
||||
# fail_silently=False
|
||||
#)
|
||||
|
||||
def send_mail_wrapper(subject, message):
|
||||
send_mail(
|
||||
subject,
|
||||
message,
|
||||
'no-reply@sahkoinsinoorikilta.fi',
|
||||
['viestintamestari@sahkoinsinoorikilta.fi'],
|
||||
fail_silently=False
|
||||
)
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def index(request, *args, **kwargs):
|
||||
return render(request, 'members_index.html',{})
|
||||
return render(request, 'members_index.html', {})
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
def applicationindex(request, *args, **kwargs):
|
||||
return render(request, 'application_index.html',{})
|
||||
def application_index(request, *args, **kwargs):
|
||||
return render(request, 'application_index.html', {})
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
def applicationSuccessIndex(request, *args, **kwargs):
|
||||
return render(request, 'application_success.html',{})
|
||||
def application_success_index(request, *args, **kwargs):
|
||||
return render(request, 'application_success.html', {})
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def members(request, *args, **kwargs):
|
||||
mems = list(map(lambda m: m.get_dict(),Member.objects.all()))
|
||||
mems = list(map(lambda m: m.get_dict(), Member.objects.all()))
|
||||
return HttpResponse(json.dumps(mems))
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET", "POST", "DELETE","PUT"])
|
||||
@require_http_methods(["GET", "POST", "DELETE", "PUT"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def member(request,*args, **kwargs):
|
||||
def member(request, *args, **kwargs):
|
||||
|
||||
# get, put and delete together since all operate on existing objects
|
||||
if request.method in ['GET','PUT', 'DELETE']:
|
||||
if request.method in ['GET', 'PUT', 'DELETE']:
|
||||
|
||||
# get object by id or give 404
|
||||
idx = kwargs.pop("idx", None)
|
||||
@@ -106,6 +112,7 @@ def member(request,*args, **kwargs):
|
||||
except ValueError:
|
||||
return HttpResponseBadRequest('{"error" : "Invalid parameters supplied"}')
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["POST"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
@@ -117,11 +124,12 @@ def csv_import(request, *args, **kwargs):
|
||||
resp.status_code = 400
|
||||
return resp
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def member_requests(request, *args, **kwargs):
|
||||
reqs = list(map(lambda r: r.get_dict(),MemberRequest.objects.all()))
|
||||
reqs = list(map(lambda r: r.get_dict(), MemberRequest.objects.all()))
|
||||
return HttpResponse(json.dumps(reqs))
|
||||
|
||||
|
||||
@@ -129,16 +137,18 @@ def member_requests(request, *args, **kwargs):
|
||||
def new_member_request(request, *args, **kwargs):
|
||||
try:
|
||||
data = json.loads(request.body.decode("utf-8"))
|
||||
#get captcha response from member
|
||||
# get captcha response from member
|
||||
captcha = data.pop("reCaptchaResponse", "")
|
||||
#send response to google and check it out
|
||||
captcha_ok = validateReCaptcha(captcha)
|
||||
#if not ok, inform user
|
||||
# send response to google and check it out
|
||||
captcha_ok = validate_recaptcha(captcha)
|
||||
# if not ok, inform user
|
||||
if not captcha_ok:
|
||||
return HttpResponseBadRequest('{"error" : "Captcha not ok. Please try again."}')
|
||||
#if ok continue
|
||||
return HttpResponseBadRequest('{"error": "Captcha not ok. Please try again."}')
|
||||
# if ok continue
|
||||
mem = Member.create_from_dict(data)
|
||||
req = MemberRequest.objects.create(member=mem)
|
||||
|
||||
# Build the email body
|
||||
subject = 'New application'
|
||||
message = 'You have new application\r\n'
|
||||
message += 'Member info:\r\n'
|
||||
@@ -150,13 +160,18 @@ def new_member_request(request, *args, **kwargs):
|
||||
message += 'To mail list: ' + str(mem.jas) + '\r\n'
|
||||
message += 'Created: ' + mem.created.isoformat(' ') + '\r\n'
|
||||
message += 'Please go to the http://sika.sahkoinsinoorikilta.fi/members/ and do something about it!\r\n'
|
||||
#sendmail(subject, message)
|
||||
|
||||
# TODO: send mail when application is ready
|
||||
# send_mail_wrapper(subject, message)
|
||||
|
||||
return HttpResponse(json.dumps(mem.get_dict()))
|
||||
|
||||
except ValueError:
|
||||
return HttpResponseBadRequest('{"error" : "Invalid parameters supplied"}')
|
||||
except TimeoutError:
|
||||
return HttpResponseBadRequest('{"error" : "Much error, no connection"}')
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET", "POST", "DELETE"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
@@ -171,23 +186,28 @@ def handle_mem_request(request, idx, *args, **kwargs):
|
||||
return HttpResponse(json.dumps(req.get_dict()))
|
||||
elif request.method == 'DELETE':
|
||||
req.member.delete()
|
||||
else: # method == POST because other aren't allowed here
|
||||
else: # method == POST because other aren't allowed here
|
||||
req.delete()
|
||||
return HttpResponse('{"status":"success"}')
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
@require_http_methods(["GET"])
|
||||
@permission_required('members.change_member', login_url='/login')
|
||||
def export_csv(request, *args, **kwargs):
|
||||
import csv
|
||||
|
||||
response = HttpResponse()
|
||||
response['Content-type'] = 'text/csv'
|
||||
response['Accept'] = 'text/csv'
|
||||
response['Content-Disposition'] = 'filename; filename=members.csv'
|
||||
writer = csv.writer(response, csv.excel)
|
||||
response.write(u'\ufeff'.encode('utf8')) # BOM (optional...Excel needs it to open UTF-8 file properly)
|
||||
response.write(u'\ufeff'.encode('utf8')) # BOM (optional...Excel needs it to open UTF-8 file properly)
|
||||
for obj in Member.objects.all():
|
||||
data = obj.get_dict()
|
||||
field_list = [str(data['id']), str(data['first_name']), str(data['last_name']), str(data['email']), str(data['POR']), str(data['AYY']), str(data['jas']), str(data['created']), str(data['paid'])]
|
||||
field_list = map(lambda s: str(data[s]),
|
||||
['id', 'first_name', 'last_name', 'email', 'POR', 'AYY', 'jas', 'created', 'paid'])
|
||||
|
||||
writer.writerow(field_list)
|
||||
return response
|
||||
|
||||
return response
|
||||
Reference in New Issue
Block a user