From 39631427b4cccd0c368f944f2452a70c300878e8 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 22 May 2013 00:36:31 +0100 Subject: [PATCH] Double to single quotes. --- setup.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/setup.py b/setup.py index 5773ae03f96..b30ccbd4940 100755 --- a/setup.py +++ b/setup.py @@ -20,7 +20,8 @@ if setup_dirname != '': os.chdir(setup_dirname) # 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 # virtualenv, buildout, and others. with_setuptools = False @@ -83,7 +84,7 @@ class TestCommand(Command): if self.runtests_opts: test_cmd += ' {0}'.format(self.runtests_opts) - print("running test") + print('running test') test_process = Popen( test_cmd, shell=True, stdout=sys.stdout, stderr=sys.stderr, @@ -108,13 +109,13 @@ class Clean(clean): break -install_version_template = """\ +install_version_template = '''\ # This file was auto-generated by salt's setup on \ {date:%A, %d %B %Y @ %H:%m:%S UTC}. __version__ = {version!r} __version_info__ = {version_info!r} -""" +''' class Build(build): @@ -269,23 +270,23 @@ if HAS_ESKY: # appropriate kwargs to setup options = setup_kwargs.get('options', {}) options['bdist_esky'] = { - "freezer_module": "bbfreeze", - "freezer_options": { - "includes": freezer_includes + 'freezer_module': 'bbfreeze', + 'freezer_options': { + 'includes': freezer_includes } } setup_kwargs['options'] = options if with_setuptools: setup_kwargs['entry_points'] = { - "console_scripts": ["salt-master = salt.scripts:salt_master", - "salt-minion = salt.scripts:salt_minion", - "salt-syndic = salt.scripts:salt_syndic", - "salt-key = salt.scripts:salt_key", - "salt-cp = salt.scripts:salt_cp", - "salt-call = salt.scripts:salt_call", - "salt-run = salt.scripts:salt_run", - "salt = salt.scripts:salt_main" + 'console_scripts': ['salt-master = salt.scripts:salt_master', + 'salt-minion = salt.scripts:salt_minion', + 'salt-syndic = salt.scripts:salt_syndic', + 'salt-key = salt.scripts:salt_key', + 'salt-cp = salt.scripts:salt_cp', + 'salt-call = salt.scripts:salt_call', + 'salt-run = salt.scripts:salt_run', + 'salt = salt.scripts:salt_main' ], } else: