Merge branch '2.3.x'

test_project/envfile

@@ -0,0 +1,2 @@
+WEBMAIL_DEV_USERNAME=tonio@ngyn.org
+WEBMAIL_DEV_PASSWORD=Aka/12ctogael

test_project/manage.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import unicode_literals
 
 import os
 import sys
@@ -20,6 +19,6 @@ if __name__ == "__main__":
                 "Couldn't import Django. Are you sure it's installed and "
                 "available on your PYTHONPATH environment variable? Did you "
                 "forget to activate a virtual environment?"
-            )
+            ) from None
         raise
     execute_from_command_line(sys.argv)

test_project/test_project/settings.py

@@ -274,10 +274,19 @@ PID_FILE_STORAGE_PATH = "/tmp"
 
 # REDIS
 
+REDIS_SENTINEL = bool(os.environ.get("REDIS_SENTINEL", False))
+REDIS_SENTINELS = [
+    (
+        os.environ.get("REDIS_SENTINEL_HOST", "127.0.0.1"),
+        os.environ.get("REDIS_SENTINEL_PORT", 26379),
+    )
+]
+REDIS_MASTER = os.environ.get("REDIS_MASTER", "mymaster")
+
 REDIS_HOST = os.environ.get("REDIS_HOST", "127.0.0.1")
 REDIS_PORT = os.environ.get("REDIS_PORT", 6379)
 REDIS_QUOTA_DB = 0
-REDIS_URL = "redis://{}:{}/{}".format(REDIS_HOST, REDIS_PORT, REDIS_QUOTA_DB)
+REDIS_URL = f"redis://{REDIS_HOST}:{REDIS_PORT}/{REDIS_QUOTA_DB}"
 
 # RQ
 

test_project/test_project/wsgi.py

@@ -7,8 +7,6 @@ For more information on this file, see
 https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
 """
 
-from __future__ import unicode_literals
-
 import os
 
 from django.core.wsgi import get_wsgi_application