Commit 80fe9c80 authored by Jason R. Coombs's avatar Jason R. Coombs

Extract embedded function as protected staticmethod.

--HG--
extra : rebase_source : 04b4807ccc7bf95d87797716f5d3488d420fa692
parent 1f83ddb9
......@@ -739,14 +739,6 @@ Please make the appropriate changes for your system and try again.
spec = str(dist.as_requirement())
is_script = is_python_script(script_text, script_name)
def get_template(filename):
"""
There are a couple of template scripts in the package. This
function loads one of them and prepares it for use.
"""
raw_bytes = resource_string('setuptools', template_name)
return raw_bytes.decode('utf-8')
if is_script:
# See https://bitbucket.org/pypa/setuptools/issue/134 for info
# on script file naming and downstream issues with SVR4
......@@ -754,9 +746,18 @@ Please make the appropriate changes for your system and try again.
if dev_path:
template_name = template_name.replace('.tmpl', ' (dev).tmpl')
script_text = (get_script_header(script_text) +
get_template(template_name) % locals())
self._load_template(template_name) % locals())
self.write_script(script_name, _to_ascii(script_text), 'b')
@staticmethod
def _load_template(name):
"""
There are a couple of template scripts in the package. This
function loads one of them and prepares it for use.
"""
raw_bytes = resource_string('setuptools', name)
return raw_bytes.decode('utf-8')
def write_script(self, script_name, contents, mode="t", blockers=()):
"""Write an executable file to the scripts directory"""
self.delete_blockers( # clean up old .py/.pyw w/o a script
......
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