aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmanage.py2
-rw-r--r--pysite/__init__.py (renamed from pydis_django/__init__.py)0
-rw-r--r--pysite/hosts.py (renamed from pydis_django/hosts.py)2
-rw-r--r--pysite/settings.py (renamed from pydis_django/settings.py)13
-rw-r--r--pysite/urls/__init__.py (renamed from pydis_django/urls/__init__.py)0
-rw-r--r--pysite/urls/admin.py (renamed from pydis_django/urls/admin.py)0
-rw-r--r--pysite/urls/api.py (renamed from pydis_django/urls/api.py)0
-rw-r--r--pysite/urls/main.py (renamed from pydis_django/urls/main.py)0
-rw-r--r--pysite/urls/staff.py (renamed from pydis_django/urls/staff.py)0
-rw-r--r--pysite/urls/wiki.py (renamed from pydis_django/urls/wiki.py)0
-rw-r--r--pysite/urls/ws.py (renamed from pydis_django/urls/ws.py)0
-rw-r--r--pysite/wsgi.py (renamed from pydis_django/wsgi.py)4
-rw-r--r--tox.ini2
13 files changed, 11 insertions, 12 deletions
diff --git a/manage.py b/manage.py
index 4688df77..f43b0986 100755
--- a/manage.py
+++ b/manage.py
@@ -3,7 +3,7 @@ import os
import sys
if __name__ == '__main__':
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pydis_django.settings')
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pysite.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
diff --git a/pydis_django/__init__.py b/pysite/__init__.py
index e69de29b..e69de29b 100644
--- a/pydis_django/__init__.py
+++ b/pysite/__init__.py
diff --git a/pydis_django/hosts.py b/pysite/hosts.py
index 898902dc..bb261dee 100644
--- a/pydis_django/hosts.py
+++ b/pysite/hosts.py
@@ -2,7 +2,7 @@ from django.conf import settings
from django_hosts import host, patterns
host_patterns = patterns(
- "pydis_django.urls",
+ "pysite.urls",
# > | Subdomain | URL Module | Host entry name |
host(r"admin", "admin", name="admin"),
diff --git a/pydis_django/settings.py b/pysite/settings.py
index 657fef3b..fc705db6 100644
--- a/pydis_django/settings.py
+++ b/pysite/settings.py
@@ -1,5 +1,5 @@
"""
-Django settings for pydis_django project.
+Django settings for pysite project.
Generated by 'django-admin startproject' using Django 2.1.
@@ -51,14 +51,13 @@ MIDDLEWARE = [
"django_hosts.middleware.HostsResponseMiddleware",
]
-ROOT_URLCONF = "pydis_django.urls.main"
+ROOT_URLCONF = "pysite.urls.main"
TEMPLATES = [
{
+ "BACKEND": "django.template.backends.django.DjangoTemplates",
+ "DIRS": [os.path.join(BASE_DIR, "pysite", "templates")],
"APP_DIRS": True,
- "BACKEND": "django.template.backends.jinja2.Jinja2",
- "DIRS": [os.path.join(BASE_DIR, "templates")],
-
"OPTIONS": {
"builtins": [
"django_hosts.templatetags.hosts_override",
@@ -74,7 +73,7 @@ TEMPLATES = [
},
]
-WSGI_APPLICATION = "pydis_django.wsgi.application"
+WSGI_APPLICATION = "pysite.wsgi.application"
# Database
@@ -137,4 +136,4 @@ if os.getenv("DEBUG") is not None: # Debug mode
DEBUG = True
PARENT_HOST = "pythondiscord.local:8000"
-ROOT_HOSTCONF = "pydis_django.hosts"
+ROOT_HOSTCONF = "pysite.hosts"
diff --git a/pydis_django/urls/__init__.py b/pysite/urls/__init__.py
index e69de29b..e69de29b 100644
--- a/pydis_django/urls/__init__.py
+++ b/pysite/urls/__init__.py
diff --git a/pydis_django/urls/admin.py b/pysite/urls/admin.py
index dfc73621..dfc73621 100644
--- a/pydis_django/urls/admin.py
+++ b/pysite/urls/admin.py
diff --git a/pydis_django/urls/api.py b/pysite/urls/api.py
index dfc73621..dfc73621 100644
--- a/pydis_django/urls/api.py
+++ b/pysite/urls/api.py
diff --git a/pydis_django/urls/main.py b/pysite/urls/main.py
index 90453f65..90453f65 100644
--- a/pydis_django/urls/main.py
+++ b/pysite/urls/main.py
diff --git a/pydis_django/urls/staff.py b/pysite/urls/staff.py
index dfc73621..dfc73621 100644
--- a/pydis_django/urls/staff.py
+++ b/pysite/urls/staff.py
diff --git a/pydis_django/urls/wiki.py b/pysite/urls/wiki.py
index dfc73621..dfc73621 100644
--- a/pydis_django/urls/wiki.py
+++ b/pysite/urls/wiki.py
diff --git a/pydis_django/urls/ws.py b/pysite/urls/ws.py
index dfc73621..dfc73621 100644
--- a/pydis_django/urls/ws.py
+++ b/pysite/urls/ws.py
diff --git a/pydis_django/wsgi.py b/pysite/wsgi.py
index 17fb615f..0a7ca6bd 100644
--- a/pydis_django/wsgi.py
+++ b/pysite/wsgi.py
@@ -1,5 +1,5 @@
"""
-WSGI config for pydis_django project.
+WSGI config for pysite project.
It exposes the WSGI callable as a module-level variable named ``application``.
@@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pydis_django.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pysite.settings')
application = get_wsgi_application()
diff --git a/tox.ini b/tox.ini
index b0665584..e63cfd3f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[flake8]
max-line-length=120
-application_import_names=pydis_django
+application_import_names=pysite
ignore=P102,B311,W503,E226,S311,E241
exclude=__pycache__, venv, .venv, tests
import-order-style=pycharm