External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-02 17:28:51 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2664 from anoek/todo-cleanup

Browse Source 
API todo/fixme addressing and cleanup
This commit is contained in:
Akita Noek
2016-06-28 11:01:41 -04:00
committed by GitHub
parent 511ec70312 9f43b6e60c
commit 5ed36624a3
18 changed files with 50 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/base.py
View File

@@ -137,7 +137,7 @@ class BaseModel(models.Model):
errors = {}
try:
super(BaseModel, self).clean_fields(exclude)
except ValidationError, e:
except ValidationError as e:
errors = e.update_error_dict(errors)
for f in self._meta.fields:
if f.name in exclude:
@@ -145,7 +145,7 @@ class BaseModel(models.Model):
if hasattr(self, 'clean_%s' % f.name):
try:
setattr(self, f.name, getattr(self, 'clean_%s' % f.name)())
except ValidationError, e:
except ValidationError as e:
errors[f.name] = e.messages
if errors:
raise ValidationError(errors)

4
awx/main/models/jobs.py
View File

@@ -701,7 +701,7 @@ class Job(UnifiedJob, JobOptions):
return
try:
extra_vars = json.loads(extra_data)
except Exception, e:
except Exception as e:
logger.warn("Exception deserializing extra vars: " + str(e))
evars = self.extra_vars_dict
evars.update(extra_vars)
@@ -1316,7 +1316,7 @@ class SystemJob(UnifiedJob, SystemJobOptions):
return
try:
extra_vars = json.loads(extra_data)
except Exception, e:
except Exception as e:
logger.warn("Exception deserializing extra vars: " + str(e))
evars = self.extra_vars_dict
evars.update(extra_vars)

4
awx/main/models/projects.py
View File

@@ -115,7 +115,7 @@ class ProjectOptions(models.Model):
try:
scm_url = update_scm_url(self.scm_type, scm_url,
check_special_cases=False)
except ValueError, e:
except ValueError as e:
raise ValidationError((e.args or ('Invalid SCM URL.',))[0])
scm_url_parts = urlparse.urlsplit(scm_url)
if self.scm_type and not any(scm_url_parts):
@@ -142,7 +142,7 @@ class ProjectOptions(models.Model):
try:
update_scm_url(self.scm_type, self.scm_url, scm_username,
scm_password)
except ValueError, e:
except ValueError as e:
raise ValidationError((e.args or ('Invalid credential.',))[0])
except ValueError:
pass