Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Py3 compatability issue #55271

Merged
merged 2 commits into from
Nov 29, 2019
Merged

Fix Py3 compatability issue #55271

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5186754
Fix Py3 compatability issue
s0undt3ch Nov 12, 2019
dd0f634
Merge branch 'master' into master
dwoz Nov 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions salt/modules/upstart_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@
import glob
import os
import re
import itertools
import fnmatch

# Import salt libs
import salt.modules.cmdmod
import salt.utils.files
import salt.utils.path
import salt.utils.systemd
from salt.ext.six.moves import filter # pylint: disable=import-error,redefined-builtin

__func_alias__ = {
'reload_': 'reload'
Expand Down Expand Up @@ -190,7 +190,7 @@ def _upstart_is_disabled(name):
in /etc/init/[name].conf.
'''
files = ['/etc/init/{0}.conf'.format(name), '/etc/init/{0}.override'.format(name)]
for file_name in itertools.ifilter(os.path.isfile, files):
for file_name in filter(os.path.isfile, files):
with salt.utils.files.fopen(file_name) as fp_:
if re.search(r'^\s*manual',
salt.utils.stringutils.to_unicode(fp_.read()),
Expand Down Expand Up @@ -516,7 +516,7 @@ def _upstart_enable(name):
return _upstart_is_enabled(name)
override = '/etc/init/{0}.override'.format(name)
files = ['/etc/init/{0}.conf'.format(name), override]
for file_name in itertools.ifilter(os.path.isfile, files):
for file_name in filter(os.path.isfile, files):
with salt.utils.files.fopen(file_name, 'r+') as fp_:
new_text = re.sub(r'^\s*manual\n?',
'',
Expand Down