Merge branch 'develop' into feature-pep8-fixes

This commit is contained in:
Jan Tuomi
2017-09-20 23:32:41 +03:00
16 changed files with 205 additions and 155 deletions
+1 -3
View File
@@ -13,7 +13,7 @@ class BaseMember(models.Model):
first_name = models.CharField(_("First name"), max_length=127)
last_name = models.CharField(_("Last name"), max_length=127)
email = models.EmailField(_("Email"))
email = models.EmailField(_("Email"), unique=True)
POR = models.CharField(_("Place of residence"),
max_length=255) # place of residence
AYY = models.BooleanField(_("AYY"), default=False)
@@ -30,8 +30,6 @@ class BaseMember(models.Model):
@staticmethod
def from_csv(data):
"""Construct member model from csv data."""
print("Imported CSV data: {}".format(data))
clean_data = data.strip().split('\n')
csv_reader = csv.reader(clean_data)