Hopiu/django-dbtemplates
1
0
Fork 0
mirror of https://github.com/jazzband/django-dbtemplates.git synced 2026-05-12 09:33:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #100 from nschlemm/nschlemm-patch-raw_input

Browse source
This commit is contained in:
John Vandenberg 2020-05-05 20:36:54 +07:00 committed by GitHub
commit ae97ad7e24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dbtemplates/management/commands/sync_templates.py
View file

@ -1,16 +1,17 @@
import io
import os
import sys
from django.contrib.sites.models import Site
from django.core.management.base import CommandError, BaseCommand
from django.template.utils import get_app_template_dirs
from django.template.loader import _engine_list
try:
from django.utils.six import input as raw_input
except ImportError:
pass
from dbtemplates.models import Template
# (propably obsolete) backwards compatability as django already threw out six
if sys.version_info[0] == 2:
input = raw_input # noqa: F821
ALWAYS_ASK, FILES_TO_DATABASE, DATABASE_TO_FILES = ('0', '1', '2')
DIRS = []
@ -83,7 +84,7 @@ class Command(BaseCommand):
t = Template.on_site.get(name__exact=name)
except Template.DoesNotExist:
if not force:
confirm = raw_input(
confirm = input(
"\nA '%s' template doesn't exist in the "
"database.\nCreate it with '%s'?"
" (y/[n]): """ % (name, path))
@ -95,7 +96,7 @@ class Command(BaseCommand):
else:
while 1:
if overwrite == ALWAYS_ASK:
confirm = raw_input(
confirm = input(
"\n%(template)s exists in the database.\n"
"(1) Overwrite %(template)s with '%(path)s'\n"
"(2) Overwrite '%(path)s' with %(template)s\n"