saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Double to single quotes.

Browse source
This commit is contained in:
Pedro Algarvio 2013-05-22 00:36:31 +01:00
parent 65234c01e2
commit 39631427b4
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
setup.py
View file

@ -20,7 +20,8 @@ if setup_dirname != '':
os.chdir(setup_dirname) os.chdir(setup_dirname)
# Use setuptools only if the user opts-in by setting the USE_SETUPTOOLS env var # Use setuptools only if the user opts-in by setting the USE_SETUPTOOLS env var
# Or if setuptools was previously imported (which is the case when using 'distribute') # Or if setuptools was previously imported (which is the case when using
# 'distribute')
# This ensures consistent behavior but allows for advanced usage with # This ensures consistent behavior but allows for advanced usage with
# virtualenv, buildout, and others. # virtualenv, buildout, and others.
with_setuptools = False with_setuptools = False
@ -83,7 +84,7 @@ class TestCommand(Command):
if self.runtests_opts: if self.runtests_opts:
test_cmd += ' {0}'.format(self.runtests_opts) test_cmd += ' {0}'.format(self.runtests_opts)
print("running test") print('running test')
test_process = Popen( test_process = Popen(
test_cmd, shell=True, test_cmd, shell=True,
stdout=sys.stdout, stderr=sys.stderr, stdout=sys.stdout, stderr=sys.stderr,
@ -108,13 +109,13 @@ class Clean(clean):
break break
install_version_template = """\ install_version_template = '''\
# This file was auto-generated by salt's setup on \ # This file was auto-generated by salt's setup on \
{date:%A, %d %B %Y @ %H:%m:%S UTC}. {date:%A, %d %B %Y @ %H:%m:%S UTC}.
__version__ = {version!r} __version__ = {version!r}
__version_info__ = {version_info!r} __version_info__ = {version_info!r}
""" '''
class Build(build): class Build(build):
@ -269,23 +270,23 @@ if HAS_ESKY:
# appropriate kwargs to setup # appropriate kwargs to setup
options = setup_kwargs.get('options', {}) options = setup_kwargs.get('options', {})
options['bdist_esky'] = { options['bdist_esky'] = {
"freezer_module": "bbfreeze", 'freezer_module': 'bbfreeze',
"freezer_options": { 'freezer_options': {
"includes": freezer_includes 'includes': freezer_includes
} }
} }
setup_kwargs['options'] = options setup_kwargs['options'] = options
if with_setuptools: if with_setuptools:
setup_kwargs['entry_points'] = { setup_kwargs['entry_points'] = {
"console_scripts": ["salt-master = salt.scripts:salt_master", 'console_scripts': ['salt-master = salt.scripts:salt_master',
"salt-minion = salt.scripts:salt_minion", 'salt-minion = salt.scripts:salt_minion',
"salt-syndic = salt.scripts:salt_syndic", 'salt-syndic = salt.scripts:salt_syndic',
"salt-key = salt.scripts:salt_key", 'salt-key = salt.scripts:salt_key',
"salt-cp = salt.scripts:salt_cp", 'salt-cp = salt.scripts:salt_cp',
"salt-call = salt.scripts:salt_call", 'salt-call = salt.scripts:salt_call',
"salt-run = salt.scripts:salt_run", 'salt-run = salt.scripts:salt_run',
"salt = salt.scripts:salt_main" 'salt = salt.scripts:salt_main'
], ],
} }
else: else: