Commit 99475b7b authored by Jason R. Coombs's avatar Jason R. Coombs

Moved filename resolution into _load_template

--HG--
extra : rebase_source : beb6c57dfd500432304518b9d313d1a98e2614b9
parent 80fe9c80
...@@ -740,21 +740,22 @@ Please make the appropriate changes for your system and try again. ...@@ -740,21 +740,22 @@ Please make the appropriate changes for your system and try again.
is_script = is_python_script(script_text, script_name) is_script = is_python_script(script_text, script_name)
if is_script: if is_script:
# See https://bitbucket.org/pypa/setuptools/issue/134 for info
# on script file naming and downstream issues with SVR4
template_name = 'script.tmpl'
if dev_path:
template_name = template_name.replace('.tmpl', ' (dev).tmpl')
script_text = (get_script_header(script_text) + script_text = (get_script_header(script_text) +
self._load_template(template_name) % locals()) self._load_template(dev_path) % locals())
self.write_script(script_name, _to_ascii(script_text), 'b') self.write_script(script_name, _to_ascii(script_text), 'b')
@staticmethod @staticmethod
def _load_template(name): def _load_template(dev_path):
""" """
There are a couple of template scripts in the package. This There are a couple of template scripts in the package. This
function loads one of them and prepares it for use. function loads one of them and prepares it for use.
""" """
# See https://bitbucket.org/pypa/setuptools/issue/134 for info
# on script file naming and downstream issues with SVR4
name = 'script.tmpl'
if dev_path:
name = name.replace('.tmpl', ' (dev).tmpl')
raw_bytes = resource_string('setuptools', name) raw_bytes = resource_string('setuptools', name)
return raw_bytes.decode('utf-8') return raw_bytes.decode('utf-8')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment