from django import forms
from django.contrib.auth.models import User
from django.forms import ModelForm
from models import Entrada, User
 
class SignUpForm(ModelForm):
    password1 = forms.CharField(label=("Password"),
        widget=forms.PasswordInput)
    password2 = forms.CharField(label=("Password confirmation"),
        widget=forms.PasswordInput,
        help_text=("Enter the same password as above, for verification."))
    class Meta:
        model = User
        fields = ['username', 'password1' , 'password2' , 'email' , 'first_name', 'last_name']
        widgets = {
<<<<<<< HEAD
            'password1': forms.PasswordInput(),
            'password2': forms.PasswordInput(),
        }
        
    def save(self, commit=True):
        user = super(UserCreateForm, self).save(commit=False)
        user.email = self.cleaned_data["email"]
        if commit:
            user.save()
        return user


=======
            'password': forms.PasswordInput(),
        }
class PostForm(forms.ModelForm):
    class Meta:
        model = Entrada
        fields = ('titulo', 'resumen', 'contenido', 'published', 'categoria')
>>>>>>> 10a1942eb906a899c3f2c813b9faf0d865cd3e4c

@@ -581,21 +581,9 @@
 = %7B%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD
 %0A
+
     
@@ -701,276 +701,8 @@
     
-def save(self, commit=True):%0A        user = super(UserCreateForm, self).save(commit=False)%0A        user.email = self.cleaned_data%5B%22email%22%5D%0A        if commit:%0A            user.save()%0A        return user%0A%0A%0A=======%0A            'password': forms.PasswordInput(),%0A        %7D
 %0Acla
@@ -853,53 +853,5 @@
 a')%0A
-%3E%3E%3E%3E%3E%3E%3E 10a1942eb906a899c3f2c813b9faf0d865cd3e4c
 %0A

Update forms.py