Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
f42f5e67
Commit
f42f5e67
authored
Sep 29, 2015
by
James Cammarata
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12552 from mgedmin/py3k
Python 3: there's no basestring
parents
95ede22a
5edd6d9b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
lib/ansible/playbook/task.py
+1
-1
No files found.
lib/ansible/playbook/task.py
View file @
f42f5e67
...
...
@@ -118,7 +118,7 @@ class Task(Base, Conditional, Taggable, Become):
def
_merge_kv
(
self
,
ds
):
if
ds
is
None
:
return
""
elif
isinstance
(
ds
,
basestring
):
elif
isinstance
(
ds
,
string_types
):
return
ds
elif
isinstance
(
ds
,
dict
):
buf
=
""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment