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

Use %s string formatting in system/timezone.py (#2632)

Browse source 
This module was using python 2.6 string .format().
To enable the module to run on python2.4, replace
the .format formatting with '%s' based string formatting.

There was also a use of a 'filename' variable in the
NosystemdTimezone.get() method that was never set.

An import of 'os' was also added for clarity.
This commit is contained in:
Adrian Likins 2016-07-28 17:02:00 -04:00 committed by Matt Clay
parent fa1b0312eb
commit 66716d58a2
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/ansible/modules/extras/system/timezone.py
View file

@ -18,6 +18,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
import os
import re import re
DOCUMENTATION = ''' DOCUMENTATION = '''
@ -146,7 +147,7 @@ class Timezone(object):
command = ' '.join(commands) command = ' '.join(commands)
(rc, stdout, stderr) = self.module.run_command(command, check_rc=True) (rc, stdout, stderr) = self.module.run_command(command, check_rc=True)
if kwargs.get('log', False): if kwargs.get('log', False):
self.msg.append('executed `{0}`'.format(command)) self.msg.append('executed `%s`' % command)
return stdout return stdout
def diff(self, phase1='before', phase2='after'): def diff(self, phase1='before', phase2='after'):
@ -238,9 +239,9 @@ class SystemdTimezone(Timezone):
# Validate given timezone # Validate given timezone
if 'name' in self.value: if 'name' in self.value:
tz = self.value['name']['planned'] tz = self.value['name']['planned']
tzfile = '/usr/share/zoneinfo/{0}'.format(tz) tzfile = '/usr/share/zoneinfo/%s' % tz
if not os.path.isfile(tzfile): if not os.path.isfile(tzfile):
self.abort('given timezone "{0}" is not available'.format(tz)) self.abort('given timezone "%s" is not available' % tz)
def _get_status(self, phase): def _get_status(self, phase):
if phase not in self.status: if phase not in self.status:
@ -295,11 +296,11 @@ class NosystemdTimezone(Timezone):
# Validate given timezone # Validate given timezone
if 'name' in self.value: if 'name' in self.value:
tz = self.value['name']['planned'] tz = self.value['name']['planned']
tzfile = '/usr/share/zoneinfo/{0}'.format(tz) tzfile = '/usr/share/zoneinfo/%s' % tz
if not os.path.isfile(tzfile): if not os.path.isfile(tzfile):
self.abort('given timezone "{0}" is not available'.format(tz)) self.abort('given timezone "%s" is not available' % tz)
self.update_timezone = self.module.get_bin_path('cp', required=True) self.update_timezone = self.module.get_bin_path('cp', required=True)
self.update_timezone += ' {0} /etc/localtime'.format(tzfile) self.update_timezone += ' %s /etc/localtime' % tzfile
self.update_hwclock = self.module.get_bin_path('hwclock', required=True) self.update_hwclock = self.module.get_bin_path('hwclock', required=True)
# Distribution-specific configurations # Distribution-specific configurations
if self.module.get_bin_path('dpkg-reconfigure') is not None: if self.module.get_bin_path('dpkg-reconfigure') is not None:
@ -309,7 +310,7 @@ class NosystemdTimezone(Timezone):
self.conf_files['name'] = '/etc/timezone', self.conf_files['name'] = '/etc/timezone',
self.conf_files['hwclock'] = '/etc/default/rcS', self.conf_files['hwclock'] = '/etc/default/rcS',
self.regexps['name'] = re.compile(r'^([^\s]+)', re.MULTILINE) self.regexps['name'] = re.compile(r'^([^\s]+)', re.MULTILINE)
self.tzline_format = '{0}\n' self.tzline_format = '%s\n'
else: else:
# RHEL/CentOS # RHEL/CentOS
if self.module.get_bin_path('tzdata-update') is not None: if self.module.get_bin_path('tzdata-update') is not None:
@ -319,7 +320,7 @@ class NosystemdTimezone(Timezone):
self.conf_files['name'] = '/etc/sysconfig/clock' self.conf_files['name'] = '/etc/sysconfig/clock'
self.conf_files['hwclock'] = '/etc/sysconfig/clock' self.conf_files['hwclock'] = '/etc/sysconfig/clock'
self.regexps['name'] = re.compile(r'^ZONE\s*=\s*"?([^"\s]+)"?', re.MULTILINE) self.regexps['name'] = re.compile(r'^ZONE\s*=\s*"?([^"\s]+)"?', re.MULTILINE)
self.tzline_format = 'ZONE="{0}"\n' self.tzline_format = 'ZONE="%s"\n'
self.update_hwclock = self.module.get_bin_path('hwclock', required=True) self.update_hwclock = self.module.get_bin_path('hwclock', required=True)
def _edit_file(self, filename, regexp, value): def _edit_file(self, filename, regexp, value):
@ -336,7 +337,7 @@ class NosystemdTimezone(Timezone):
try: try:
file = open(filename, 'r') file = open(filename, 'r')
except IOError: except IOError:
self.abort('cannot read "{0}"'.format(filename)) self.abort('cannot read "%s"' % filename)
else: else:
lines = file.readlines() lines = file.readlines()
file.close() file.close()
@ -358,27 +359,30 @@ class NosystemdTimezone(Timezone):
try: try:
file = open(filename, 'w') file = open(filename, 'w')
except IOError: except IOError:
self.abort('cannot write to "{0}"'.format(filename)) self.abort('cannot write to "%s"' % filename)
else: else:
file.writelines(lines) file.writelines(lines)
file.close() file.close()
self.msg.append('Added 1 line and deleted {0} line(s) on {1}'.format(len(matched_indices), filename)) self.msg.append('Added 1 line and deleted %s line(s) on %s' % (len(matched_indices), filename))
def get(self, key, phase): def get(self, key, phase):
if key == 'hwclock' and os.path.isfile('/etc/adjtime'): if key == 'hwclock' and os.path.isfile('/etc/adjtime'):
# If /etc/adjtime exists, use that file. # If /etc/adjtime exists, use that file.
key = 'adjtime' key = 'adjtime'
filename = self.conf_files[key]
try: try:
file = open(self.conf_files[key], mode='r') file = open(filename, mode='r')
except IOError: except IOError:
self.abort('cannot read configuration file "{0}" for {1}'.format(filename, key)) self.abort('cannot read configuration file "%s" for %s' % (filename, key))
else: else:
status = file.read() status = file.read()
file.close() file.close()
try: try:
value = self.regexps[key].search(status).group(1) value = self.regexps[key].search(status).group(1)
except AttributeError: except AttributeError:
self.abort('cannot find the valid value from configuration file "{0}" for {1}'.format(filename, key)) self.abort('cannot find the valid value from configuration file "%s" for %s' % (filename, key))
else: else:
if key == 'hwclock': if key == 'hwclock':
# For key='hwclock'; convert yes/no -> UTC/local # For key='hwclock'; convert yes/no -> UTC/local
@ -395,7 +399,7 @@ class NosystemdTimezone(Timezone):
def set_timezone(self, value): def set_timezone(self, value):
self._edit_file(filename=self.conf_files['name'], self._edit_file(filename=self.conf_files['name'],
regexp=self.regexps['name'], regexp=self.regexps['name'],
value=self.tzline_format.format(value)) value=self.tzline_format.format % value)
self.execute(self.update_timezone) self.execute(self.update_timezone)
def set_hwclock(self, value): def set_hwclock(self, value):
@ -411,7 +415,7 @@ class NosystemdTimezone(Timezone):
elif key == 'hwclock': elif key == 'hwclock':
self.set_hwclock(value) self.set_hwclock(value)
else: else:
self.abort('unknown parameter "{0}"'.format(key)) self.abort('unknown parameter "%s"' % key)
def main(): def main():