summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-06-14 14:41:05 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-06-14 14:41:05 -0400
commit8c0bb3c7c09c5d3890cf9f1bb57bbfda6def8574 (patch)
tree5a6632e553843bc9546c3989c8866295c0bc9b21
parent33a2d7c967ae0c7d7cd6e461a37a166e1f8691e3 (diff)
downloadpython-setuptools-bitbucket-8c0bb3c7c09c5d3890cf9f1bb57bbfda6def8574.tar.gz
Rename script template to use .tmpl extensions.
-rw-r--r--CHANGES.txt7
-rwxr-xr-xsetuptools/command/easy_install.py4
-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