[fix] PEP-8 and Conflicts

weni-ai · Oct 23, 2019 · d9ce6c8 · d9ce6c8
1 parent 8e78c1d
commit d9ce6c8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/bothub/authentication/models.py b/bothub/authentication/models.py
@@ -90,7 +90,7 @@ def token_generator(self):
         return PasswordResetTokenGenerator()
 
     def send_welcome_email(self):
-        if not settings.SEND_EMAILS
+        if not settings.SEND_EMAILS:
             return False  # pragma: no cover
         context = {"name": self.name, "base_url": settings.BASE_URL}
         send_mail(
@@ -113,7 +113,7 @@ def send_reset_password_email(self):
         reset_url = "{}reset-password/{}/{}/".format(
             settings.BOTHUB_WEBAPP_BASE_URL, self.nickname, token
         )
-        context = {"reset_url": reset_url, 'base_url': settings.BASE_URL}
+        context = {"reset_url": reset_url, "base_url": settings.BASE_URL}
         send_mail(
             _("Reset your bothub password"),
             render_to_string("authentication/emails/reset_password.txt", context),

diff --git a/bothub/common/models.py b/bothub/common/models.py
@@ -1126,7 +1126,10 @@ def send_new_request_email_to_admins(self):
     def send_request_rejected_email(self):
         if not settings.SEND_EMAILS:
             return False  # pragma: no cover
-        context = {"repository_name": self.repository.name, "base_url": settings.BASE_URL}
+        context = {
+            "repository_name": self.repository.name,
+            "base_url": settings.BASE_URL,
+        }
         send_mail(
             _("Access denied to {}").format(self.repository.name),
             render_to_string("common/emails/request_rejected.txt", context),

diff --git a/bothub/settings.py b/bothub/settings.py
@@ -45,6 +45,7 @@
     BOTHUB_ENGINE_AWS_S3_BUCKET_NAME=(str, ""),
     BOTHUB_ENGINE_AWS_REGION_NAME=(str, "us-east-1"),
     BOTHUB_ENGINE_AWS_SEND=(bool, False),
+    BASE_URL=(str, "http://api.bothub.it/"),
 )
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -59,7 +60,7 @@
 
 ALLOWED_HOSTS = env.list("ALLOWED_HOSTS")
 
-BASE_URL = config('BASE_URL', default='')
+BASE_URL = env.str("BASE_URL")
 
 # Application definition
 

diff --git a/bothub/urls.py b/bothub/urls.py
@@ -56,7 +56,9 @@ def wrapper(request):
                     path(
                         "welcome/",
                         render_template(
-                            "authentication/emails/welcome.html", name="User", base_url=settings.BASE_URL
+                            "authentication/emails/welcome.html",
+                            name="User",
+                            base_url=settings.BASE_URL,
                         ),
                     ),
                     path(