From 6401988885a42d3f4c612c20973948b7b4cab7a5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 14 Jun 2014 14:41:05 -0400
Subject: 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
---
 CHANGES.txt                         |  7 +++++++
 setuptools/command/easy_install.py  |  4 ++--
 setuptools/script (dev).tmpl        | 11 +++++++++++
 setuptools/script template (dev).py | 11 -----------
 setuptools/script template.py       |  4 ----
 setuptools/script.tmpl              |  4 ++++
 6 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 setuptools/script (dev).tmpl
 delete mode 100644 setuptools/script template (dev).py
 delete mode 100644 setuptools/script template.py
 create mode 100644 setuptools/script.tmpl

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 (dev).tmpl b/setuptools/script (dev).tmpl
new file mode 100644
index 00000000..c476673f
--- /dev/null
+++ b/setuptools/script (dev).tmpl	
@@ -0,0 +1,11 @@
+# EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r
+__requires__ = %(spec)r
+import sys
+from pkg_resources import require
+require(%(spec)r)
+del require
+__file__ = %(dev_path)r
+if sys.version_info < (3, 0):
+    execfile(__file__)
+else:
+    exec(compile(open(__file__).read(), __file__, 'exec'))
diff --git a/setuptools/script template (dev).py b/setuptools/script template (dev).py
deleted file mode 100644
index c476673f..00000000
--- a/setuptools/script template (dev).py	
+++ /dev/null
@@ -1,11 +0,0 @@
-# EASY-INSTALL-DEV-SCRIPT: %(spec)r,%(script_name)r
-__requires__ = %(spec)r
-import sys
-from pkg_resources import require
-require(%(spec)r)
-del require
-__file__ = %(dev_path)r
-if sys.version_info < (3, 0):
-    execfile(__file__)
-else:
-    exec(compile(open(__file__).read(), __file__, 'exec'))
diff --git a/setuptools/script template.py b/setuptools/script template.py
deleted file mode 100644
index 4504e264..00000000
--- a/setuptools/script template.py	
+++ /dev/null
@@ -1,4 +0,0 @@
-# EASY-INSTALL-SCRIPT: %(spec)r,%(script_name)r
-__requires__ = %(spec)r
-import pkg_resources
-pkg_resources.run_script(%(spec)r, %(script_name)r)
diff --git a/setuptools/script.tmpl b/setuptools/script.tmpl
new file mode 100644
index 00000000..4504e264
--- /dev/null
+++ b/setuptools/script.tmpl
@@ -0,0 +1,4 @@
+# EASY-INSTALL-SCRIPT: %(spec)r,%(script_name)r
+__requires__ = %(spec)r
+import pkg_resources
+pkg_resources.run_script(%(spec)r, %(script_name)r)
-- 
cgit v1.2.3