cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12725 from mgedmin/py3k

Browse source 
Python 3: there's no basestring
This commit is contained in:
James Cammarata 2015-10-13 16:52:46 -04:00
commit ee559e03f7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/executor/playbook_executor.py
View file

@ -24,6 +24,8 @@ import locale
import signal import signal
import sys import sys
from six import string_types
from ansible import constants as C from ansible import constants as C
from ansible.errors import * from ansible.errors import *
from ansible.executor.task_queue_manager import TaskQueueManager from ansible.executor.task_queue_manager import TaskQueueManager
@ -223,7 +225,7 @@ class PlaybookExecutor:
# check to see if the serial number was specified as a percentage, # check to see if the serial number was specified as a percentage,
# and convert it to an integer value based on the number of hosts # and convert it to an integer value based on the number of hosts
if isinstance(play.serial, basestring) and play.serial.endswith('%'): if isinstance(play.serial, string_types) and play.serial.endswith('%'):
serial_pct = int(play.serial.replace("%","")) serial_pct = int(play.serial.replace("%",""))
serial = int((serial_pct/100.0) * len(all_hosts)) serial = int((serial_pct/100.0) * len(all_hosts))
else: else: