diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-14 14:41:05 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-14 14:41:05 -0400 |
| commit | 6401988885a42d3f4c612c20973948b7b4cab7a5 (patch) | |
| tree | f1c01340424c20471119e6949fc505c2c21b13a6 | |
| parent | 35d3732c71a391367bb2f77d3cec1b254daa2287 (diff) | |
| download | external_python_setuptools-6401988885a42d3f4c612c20973948b7b4cab7a5.tar.gz external_python_setuptools-6401988885a42d3f4c612c20973948b7b4cab7a5.tar.bz2 external_python_setuptools-6401988885a42d3f4c612c20973948b7b4cab7a5.zip | |
Rename script template to use .tmpl extensions.
--HG--
rename : setuptools/script template (dev).py => setuptools/script (dev).tmpl
rename : setuptools/script template.py => setuptools/script.tmpl
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 4 | ||||
| -rw-r--r-- | setuptools/script (dev).tmpl (renamed from setuptools/script template (dev).py) | 0 | ||||
| -rw-r--r-- | setuptools/script.tmpl (renamed from setuptools/script template.py) | 0 |
4 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 94689f0a..6186edc9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,13 @@ CHANGES ======= +----- +5.0.1 +----- + +* Renamed script templates to end with .tmpl now that they no longer need + to be processed by 2to3. Fixes spurious syntax errors during build/install. + --- 5.0 --- diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 19ed1259..cc5ddbd6 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -750,9 +750,9 @@ Please make the appropriate changes for your system and try again. 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 template.py' + template_name = 'script.tmpl' if dev_path: - template_name = template_name.replace('.py', ' (dev).py') + template_name = template_name.replace('.tmpl', ' (dev).tmpl') script_text = (get_script_header(script_text) + get_template(template_name) % locals()) self.write_script(script_name, _to_ascii(script_text), 'b') diff --git a/setuptools/script template (dev).py b/setuptools/script (dev).tmpl index c476673f..c476673f 100644 --- a/setuptools/script template (dev).py +++ b/setuptools/script (dev).tmpl diff --git a/setuptools/script template.py b/setuptools/script.tmpl index 4504e264..4504e264 100644 --- a/setuptools/script template.py +++ b/setuptools/script.tmpl |