From e1abf8bec8b1d9291bcb06ba6b734fab73355f0a Mon Sep 17 00:00:00 2001 From: David Sanders Date: Mon, 21 Mar 2016 01:37:30 -0700 Subject: [PATCH 1/2] Clear TEST_COLLATION deprecation warning --- mezzanine/utils/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mezzanine/utils/conf.py b/mezzanine/utils/conf.py index b37b6fbc..0a75a8ac 100644 --- a/mezzanine/utils/conf.py +++ b/mezzanine/utils/conf.py @@ -214,7 +214,7 @@ def mezzanine_settings(): s["DATABASES"][key]["NAME"] = db_path elif shortname == "mysql": # Required MySQL collation for tests. - s["DATABASES"][key]["TEST_COLLATION"] = "utf8_general_ci" + s["DATABASES"][key].setdefault("TEST", {})["COLLATION"] = "utf8_general_ci" def real_project_name(project_name): From b76491ac61c84a7ade9d82974ed36afd5a4129e8 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Mon, 21 Mar 2016 23:24:36 -0700 Subject: [PATCH 2/2] PEP8 fix --- mezzanine/utils/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mezzanine/utils/conf.py b/mezzanine/utils/conf.py index 0a75a8ac..3e1d1165 100644 --- a/mezzanine/utils/conf.py +++ b/mezzanine/utils/conf.py @@ -211,10 +211,10 @@ def mezzanine_settings(): # it's in the project directory and add the path to it. if "NAME" in db and os.sep not in db["NAME"]: db_path = os.path.join(s.get("PROJECT_ROOT", ""), db["NAME"]) - s["DATABASES"][key]["NAME"] = db_path + db["NAME"] = db_path elif shortname == "mysql": # Required MySQL collation for tests. - s["DATABASES"][key].setdefault("TEST", {})["COLLATION"] = "utf8_general_ci" + db.setdefault("TEST", {})["COLLATION"] = "utf8_general_ci" def real_project_name(project_name):