Skip to content

Commit 9bca204

Browse files
committed
Refactor settings.py to use pathlib for path manipulation
1 parent e57ad5d commit 9bca204

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

source/app/conf/development/settings.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import warnings
2-
from os.path import dirname, abspath, join
2+
from pathlib import Path
33

44
from django.utils.translation import gettext_lazy as _
55

66
warnings.simplefilter("error", DeprecationWarning)
77

8-
BASE_DIR = dirname(dirname(dirname(dirname(abspath(__file__)))))
9-
CONTENT_DIR = join(BASE_DIR, "content")
8+
BASE_DIR = Path(__file__).resolve().parents[3]
9+
CONTENT_DIR = BASE_DIR / "content"
1010

1111
SECRET_KEY = "NhfTvayqggTBPswCXXhWaN69HuglgZIkM"
1212

1313
DEBUG = True
14-
ALLOWED_HOSTS = []
14+
ALLOWED_HOSTS = ["*"]
1515

1616
SITE_ID = 1
1717

@@ -47,7 +47,7 @@
4747
{
4848
"BACKEND": "django.template.backends.django.DjangoTemplates",
4949
"DIRS": [
50-
join(CONTENT_DIR, "templates"),
50+
CONTENT_DIR / "templates",
5151
],
5252
"APP_DIRS": True,
5353
"OPTIONS": {
@@ -64,14 +64,14 @@
6464
WSGI_APPLICATION = "app.wsgi.application"
6565

6666
EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend"
67-
EMAIL_FILE_PATH = join(CONTENT_DIR, "tmp/emails")
67+
EMAIL_FILE_PATH = CONTENT_DIR / "tmp" / "emails"
6868
EMAIL_HOST_USER = "test@example.com"
6969
DEFAULT_FROM_EMAIL = "test@example.com"
7070

7171
DATABASES = {
7272
"default": {
7373
"ENGINE": "django.db.backends.sqlite3",
74-
"NAME": join(BASE_DIR, "db.sqlite3"),
74+
"NAME": BASE_DIR / "db.sqlite3",
7575
}
7676
}
7777

@@ -126,16 +126,16 @@
126126
TIME_ZONE = "UTC"
127127
USE_TZ = True
128128

129-
STATIC_ROOT = join(CONTENT_DIR, "static")
129+
STATIC_ROOT = CONTENT_DIR / "static"
130130
STATIC_URL = "/static/"
131131

132-
MEDIA_ROOT = join(CONTENT_DIR, "media")
132+
MEDIA_ROOT = CONTENT_DIR / "media"
133133
MEDIA_URL = "/media/"
134134

135135
STATICFILES_DIRS = [
136-
join(CONTENT_DIR, "assets"),
136+
CONTENT_DIR / "assets",
137137
]
138138

139-
LOCALE_PATHS = [join(CONTENT_DIR, "locale")]
139+
LOCALE_PATHS = [CONTENT_DIR / "locale"]
140140

141141
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

source/app/conf/production/settings.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from os.path import dirname, abspath, join
1+
from pathlib import Path
22

33
from django.utils.translation import gettext_lazy as _
44

5-
BASE_DIR = dirname(dirname(dirname(dirname(abspath(__file__)))))
6-
CONTENT_DIR = join(BASE_DIR, "content")
5+
BASE_DIR = Path(__file__).resolve().parents[3]
6+
CONTENT_DIR = BASE_DIR / "content"
77

88
SECRET_KEY = "3d305kajG5Jy8KBafCMpHwDIsNi0SqVaW"
99

@@ -45,7 +45,7 @@
4545
{
4646
"BACKEND": "django.template.backends.django.DjangoTemplates",
4747
"DIRS": [
48-
join(CONTENT_DIR, "templates"),
48+
CONTENT_DIR / "templates",
4949
],
5050
"APP_DIRS": True,
5151
"OPTIONS": {
@@ -74,7 +74,7 @@
7474
DATABASES = {
7575
"default": {
7676
"ENGINE": "django.db.backends.sqlite3",
77-
"NAME": join(BASE_DIR, "db.sqlite3"),
77+
"NAME": BASE_DIR / "db.sqlite3",
7878
}
7979
}
8080

@@ -118,17 +118,17 @@
118118
TIME_ZONE = "UTC"
119119
USE_TZ = True
120120

121-
STATIC_ROOT = join(CONTENT_DIR, "static")
121+
STATIC_ROOT = CONTENT_DIR / "static"
122122
STATIC_URL = "/static/"
123123

124-
MEDIA_ROOT = join(CONTENT_DIR, "media")
124+
MEDIA_ROOT = CONTENT_DIR / "media"
125125
MEDIA_URL = "/media/"
126126

127127
STATICFILES_DIRS = [
128-
join(CONTENT_DIR, "assets"),
128+
CONTENT_DIR / "assets",
129129
]
130130

131-
LOCALE_PATHS = [join(CONTENT_DIR, "locale")]
131+
LOCALE_PATHS = [CONTENT_DIR / "locale"]
132132

133133
SIGN_UP_FIELDS = [
134134
"username",

0 commit comments

Comments
 (0)