From 8ad9bf4ff5ff25c0a88ff178f37b13ead654c268 Mon Sep 17 00:00:00 2001 From: Juanan Pereira Date: Thu, 15 Sep 2016 23:15:41 +0200 Subject: [PATCH 1/2] Avoid to use an unsupported '/' operand between two unicode strings --- lms/djangoapps/dashboard/sysadmin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/dashboard/sysadmin.py b/lms/djangoapps/dashboard/sysadmin.py index 6ed90d5e4a..15a5b2bc9b 100644 --- a/lms/djangoapps/dashboard/sysadmin.py +++ b/lms/djangoapps/dashboard/sysadmin.py @@ -345,7 +345,7 @@ class Courses(SysadminDashboardView): # Try the data dir, then try to find it in the git import dir if not gdir.exists(): git_repo_dir = getattr(settings, 'GIT_REPO_DIR', git_import.DEFAULT_GIT_REPO_DIR) - gdir = path(git_repo_dir / cdir) + gdir = path(git_repo_dir + "/" + cdir) if not gdir.exists(): return info From d92e37337a259537ed2d94e385e2ad3743a72509 Mon Sep 17 00:00:00 2001 From: Juanan Pereira Date: Mon, 19 Sep 2016 22:40:48 +0200 Subject: [PATCH 2/2] Change fix following pullrequestreview-619682 --- lms/djangoapps/dashboard/sysadmin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/dashboard/sysadmin.py b/lms/djangoapps/dashboard/sysadmin.py index 15a5b2bc9b..5ef36f7f40 100644 --- a/lms/djangoapps/dashboard/sysadmin.py +++ b/lms/djangoapps/dashboard/sysadmin.py @@ -345,7 +345,7 @@ class Courses(SysadminDashboardView): # Try the data dir, then try to find it in the git import dir if not gdir.exists(): git_repo_dir = getattr(settings, 'GIT_REPO_DIR', git_import.DEFAULT_GIT_REPO_DIR) - gdir = path(git_repo_dir + "/" + cdir) + gdir = path(git_repo_dir) / cdir if not gdir.exists(): return info