Fix a bunch of PEP8 violations

This commit is contained in:
Jan Tuomi
2017-01-19 17:55:59 +02:00
parent 16a3d03a32
commit d8dc064eb6
7 changed files with 208 additions and 139 deletions
+39 -30
View File
@@ -4,6 +4,7 @@ from datetime import datetime
from io import StringIO
import csv
class Member(models.Model):
'''
Member model represets one member on the registry
@@ -12,7 +13,7 @@ class Member(models.Model):
first_name = models.CharField(max_length=127)
last_name = models.CharField(max_length=127)
email = models.EmailField()
POR = models.CharField(max_length=255) # place of residence
POR = models.CharField(max_length=255) # place of residence
AYY = models.BooleanField(default=False)
jas = models.BooleanField(default=False)
created = models.DateTimeField(default=timezone.now)
@@ -20,59 +21,64 @@ class Member(models.Model):
def get_dict(self):
return {
'id':self.id,
'first_name':self.first_name,
'last_name':self.last_name,
'email':self.email,
'POR':self.POR,
'AYY':self.AYY,
'jas':self.jas,
'created':date2str(self.created),
'paid':date2str(self.paid),
'id': self.id,
'first_name': self.first_name,
'last_name': self.last_name,
'email': self.email,
'POR': self.POR,
'AYY': self.AYY,
'jas': self.jas,
'created': date2str(self.created),
'paid': date2str(self.paid),
}
@classmethod
def create_from_dict(cls,d):
def create_from_dict(cls, d):
mbr = cls()
mbr.update_from_dict(d)
return mbr
def update_from_dict(self,d):
def update_from_dict(self, d):
dmap = {
'first_name': reverseMap('first_name'),
'last_name': reverseMap('last_name'),
'email': reverseMap('email'),
'POR': reverseMap('POR'),
'AYY': reverseMap('AYY'),
'jas': reverseMap('jas'),
'paid': reverseMap('paid',str2date),
'first_name': reverse_map('first_name'),
'last_name': reverse_map('last_name'),
'email': reverse_map('email'),
'POR': reverse_map('POR'),
'AYY': reverse_map('AYY'),
'jas': reverse_map('jas'),
'paid': reverse_map('paid', str2date),
}
for k,v in d.items():
for k, v in d.items():
try:
self.__setattr__(dmap[k].key,dmap[k].parser(v))
self.__setattr__(dmap[k].key, dmap[k].parser(v))
except KeyError:
pass
self.save()
@classmethod
def import_csv(cls, csv_string):
reader = csv.reader(StringIO(csv_string.strip()))
response = {"status": "success", "errors": []};
response = {"status": "success", "errors": []}
try:
data = list(reader)
except ValueError:
return {"status": "failure", "errors": ["could not parse csv file"]}
affirmative_answers = ['yes', 'y', '1', 'true', "kyllä", "khyl"]
for row in data:
try:
obj = cls.objects.create(
first_name=row[0],
last_name=row[1],
email=row[2],
POR=row[3],
AYY=row[4].lower() in ['yes','y','1','true',"kyllä", "khyl"],
jas=row[5].lower() in ['yes','y','1','true',"kyllä", "khyl"],
paid = timezone.now()
AYY=row[4].lower() in affirmative_answers,
jas=row[5].lower() in affirmative_answers,
paid=timezone.now()
)
print("added obj {}".format(obj))
except:
response["status"] = "failure"
response["errors"].append("failure adding item {}".format(", ".join(row)))
@@ -82,15 +88,17 @@ class Member(models.Model):
def __str__(self):
return "{} {}".format(self.first_name, self.last_name)
class MemberRequest(models.Model):
member = models.ForeignKey(Member)
def get_dict(self):
return {
'id': self.id,
'member': self.member.get_dict(),
'id': self.id,
'member': self.member.get_dict(),
}
def date2str(date):
'''
Convert date to a standard date string
@@ -99,11 +107,12 @@ def date2str(date):
return None
return date.strftime("%Y-%m-%d %H:%M:%S")
def str2date(s):
return datetime.strptime(s,"%Y-%m-%d %H:%M:%S")
class reverseMap:
def __init__(self, key, parser=lambda x:x):
class reverse_map:
def __init__(self, key, parser=lambda x: x):
self.key = key
self.parser = parser