diff --git a/paste/forms.py b/paste/forms.py index 3d88ef9..423dfea 100644 --- a/paste/forms.py +++ b/paste/forms.py @@ -1,7 +1,7 @@ from webtools import settings from django import forms from django.forms import ModelForm, CharField -from .models import Paste, Language, EXPIRE_CHOICES +from .models import Paste, Language class PasteForm(ModelForm): diff --git a/paste/models.py b/paste/models.py index 77b547e..13b391d 100644 --- a/paste/models.py +++ b/paste/models.py @@ -7,15 +7,6 @@ from django.utils.translation import gettext_lazy as _ import shortuuid -EXPIRE_CHOICES = ( - (0, _("Never expire")), - (60, _("1 hour")), - (60 * 24, _("1 day")), - (60 * 24 * 7, _("1 week")), - (60 * 24 * 7 * 30, _("1 month")), - (60 * 24 * 7 * 365, _("1 year")), -) - class Language(models.Model): """Language object.""" diff --git a/paste/views.py b/paste/views.py index 1c16334..ba15037 100644 --- a/paste/views.py +++ b/paste/views.py @@ -23,7 +23,6 @@ def index(request): form = PasteForm( { "language": language.id, - "lifetime": settings.PASTE["default_lifetime"], "content": any_file.read().decode(), }, instance=paste, @@ -42,7 +41,6 @@ def index(request): ) data["form"] = PasteForm( initial={ - "lifetime": settings.PASTE["default_lifetime"], "language": Language.by_name(settings.PASTE["default_language"]).id, } ) diff --git a/webtools/settings.py b/webtools/settings.py index fe2aff9..923bc03 100644 --- a/webtools/settings.py +++ b/webtools/settings.py @@ -95,7 +95,6 @@ PASTE = { "enabled_renderers": ["pygments", "raw"], "default_renderer": "pygments", "max_characters": 100000, - "default_lifetime": 60 * 24 * 7 * 365, "default_language": "Python", }