diff --git a/helios/crypto/electionalgs.py b/helios/crypto/electionalgs.py index 2532504554afaf106a32eab105eba161ce03b4b7..609b5ad583c0712efcab93f6e6bbb881f98c3d78 100644 --- a/helios/crypto/electionalgs.py +++ b/helios/crypto/electionalgs.py @@ -21,7 +21,6 @@ class HeliosObject(object): JSON_FIELDS = None def __init__(self, **kwargs): - import pdb; pdb.set_trace() self.set_from_args(**kwargs) # generate uuid if need be diff --git a/helios/models.py b/helios/models.py index 8bbb08729f1466638696612f5e84aafb590cf8b6..ba0e3a148875e682f4a16f096d69451a0b6422b4 100644 --- a/helios/models.py +++ b/helios/models.py @@ -552,9 +552,11 @@ class Voter(models.Model, electionalgs.Voter): # let's link directly to the user now # FIXME: delete this as soon as migrations are set up - name = models.CharField(max_length = 200, null=True) - voter_type = models.CharField(max_length = 100) - voter_id = models.CharField(max_length = 100) + #name = models.CharField(max_length = 200, null=True) + #voter_type = models.CharField(max_length = 100) + #voter_id = models.CharField(max_length = 100) + + uuid = models.CharField(max_length = 50) # for users of type password, no user object is created # but a dynamic user object is created automatically @@ -566,8 +568,6 @@ class Voter(models.Model, electionalgs.Voter): voter_name = models.CharField(max_length = 200, null=True) voter_email = models.CharField(max_length = 250, null=True) - uuid = models.CharField(max_length = 50) - # if election uses aliases alias = models.CharField(max_length = 100, null=True)