Skip to content

Commit

Permalink
setup.py: remove raw string formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
terminalmage committed Aug 27, 2015
1 parent d983434 commit b6c7322
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions setup.py
Expand Up @@ -602,24 +602,24 @@ def run(self):
from salt.version import SaltStackVersion
__saltstack_version__ = SaltStackVersion{full_version_info!r}
__saltstack_version__ = SaltStackVersion\'{full_version_info}\'

This comment has been minimized.

Copy link
@s0undt3ch

s0undt3ch Aug 28, 2015

Member

This one should not have been un-repr'ed

17:36:10     from salt.template import check_render_pipe_str
17:36:10   File "/srv/virtualenvs/raas-pr/lib/python3.4/site-packages/salt/template.py", line 15, in <module>
17:36:10     import salt.utils
17:36:10   File "/srv/virtualenvs/raas-pr/lib/python3.4/site-packages/salt/utils/__init__.py", line 121, in <module>
17:36:10     import salt.version
17:36:10   File "/srv/virtualenvs/raas-pr/lib/python3.4/site-packages/salt/version.py", line 517, in <module>
17:36:10     __saltstack_version__ = __get_version(__saltstack_version__)
17:36:10   File "/srv/virtualenvs/raas-pr/lib/python3.4/site-packages/salt/version.py", line 510, in __get_version
17:36:10     from salt._version import __saltstack_version__  # pylint: disable=E0611,F0401
17:36:10   File "/srv/virtualenvs/raas-pr/lib/python3.4/site-packages/salt/_version.py", line 5
17:36:10     __saltstack_version__ = SaltStackVersion'(2015, 8, 0, 0, 3, 2064, 'g2db2451')'
17:36:10                                                                       ^
17:36:10 SyntaxError: invalid syntax
17:36:10 ERROR: could not load /var/lib/jenkins/workspace/raas/pr/368/tests/tests/conftest.py
'''


INSTALL_SYSPATHS_TEMPLATE = '''\
# This file was auto-generated by salt's setup on \
{date:%A, %d %B %Y @ %H:%m:%S UTC}.
ROOT_DIR = {root_dir!r}
CONFIG_DIR = {config_dir!r}
CACHE_DIR = {cache_dir!r}
SOCK_DIR = {sock_dir!r}
SRV_ROOT_DIR= {srv_root_dir!r}
BASE_FILE_ROOTS_DIR = {base_file_roots_dir!r}
BASE_PILLAR_ROOTS_DIR = {base_pillar_roots_dir!r}
BASE_MASTER_ROOTS_DIR = {base_master_roots_dir!r}
LOGS_DIR = {logs_dir!r}
PIDFILE_DIR = {pidfile_dir!r}
ROOT_DIR = \'{root_dir}\'
CONFIG_DIR = \'{config_dir}\'
CACHE_DIR = \'{cache_dir}\'
SOCK_DIR = \'{sock_dir}\'
SRV_ROOT_DIR = \'{srv_root_dir}\'
BASE_FILE_ROOTS_DIR = \'{base_file_roots_dir}\'
BASE_PILLAR_ROOTS_DIR = \'{base_pillar_roots_dir}\'
BASE_MASTER_ROOTS_DIR = \'{base_master_roots_dir}\'
LOGS_DIR = \'{logs_dir}\'
PIDFILE_DIR = \'{pidfile_dir}\'
'''


Expand Down Expand Up @@ -1179,7 +1179,7 @@ def parse_command_line(self):
if self.salt_transport not in ('zeromq', 'raet', 'both', 'ssh', 'none'):
raise DistutilsArgError(
'The value of --salt-transport needs be \'zeromq\', '
'\'raet\', \'both\', \'ssh\' or \'none\' not {0!r}'.format(
'\'raet\', \'both\', \'ssh\' or \'none\' not \'{0}\''.format(
self.salt_transport
)
)
Expand Down

0 comments on commit b6c7322

Please sign in to comment.