From c014399d6ee53ed16deb53873bad2faecbfec294 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 16 Dec 2014 13:58:47 -0500 Subject: [PATCH] Try smart_str for this particular encoding --- awx/main/models/projects.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index 64bcdd7f39..b3da3ae76a 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -18,6 +18,7 @@ from django.conf import settings from django.db import models from django.db.models import CASCADE, SET_NULL, PROTECT from django.utils.translation import ugettext_lazy as _ +from django.utils.encoding import smart_str from django.core.exceptions import ValidationError, NON_FIELD_ERRORS from django.core.urlresolvers import reverse from django.contrib.auth.models import User @@ -152,7 +153,7 @@ class ProjectOptions(models.Model): local_path = os.path.basename(self.local_path) if local_path and not local_path.startswith('.'): proj_path = os.path.join(settings.PROJECTS_ROOT, local_path) - if not check_if_exists or os.path.exists(proj_path.decode('utf-8')): + if not check_if_exists or os.path.exists(smart_str(proj_path)): return proj_path @property