Merge pull request #259 from ros-infrastructure/fix_python2

fix script generation with Python 2
ros-infrastructure · Mar 16, 2016 · 8e60356 · 8e60356
2 parents 8c5bee4 + 0bed475
commit 8e60356
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/scripts/devel/generate_devel_script.py b/scripts/devel/generate_devel_script.py
@@ -33,7 +33,7 @@ def main(argv=sys.argv[1:]):
     class IncludeHook(Hook):
 
         def __init__(self):
-            super(IncludeHook, self).__init__()
+            Hook.__init__(self)
             self.scms = []
             self.scripts = []
 
@@ -66,6 +66,7 @@ def beforeInclude(self, *args, **kwargs):
             'scms': hook.scms,
             'scripts': hook.scripts},
         options={BANGPATH_OPT: False})
+    value = value.replace('python3', sys.executable)
     print(value)
 
 

diff --git a/scripts/doc/generate_doc_script.py b/scripts/doc/generate_doc_script.py
@@ -35,7 +35,7 @@ def main(argv=sys.argv[1:]):
     class IncludeHook(Hook):
 
         def __init__(self):
-            super(IncludeHook, self).__init__()
+            Hook.__init__(self)
             self.scms = []
             self.scripts = []
 
@@ -95,6 +95,7 @@ def beforeInclude(self, *args, **kwargs):
             'scms': hook.scms,
             'scripts': scripts},
         options={BANGPATH_OPT: False})
+    value = value.replace('python3', sys.executable)
     print(value)
 
 

diff --git a/scripts/release/generate_release_script.py b/scripts/release/generate_release_script.py
@@ -38,7 +38,7 @@ def main(argv=sys.argv[1:]):
     class IncludeHook(Hook):
 
         def __init__(self):
-            super(IncludeHook, self).__init__()
+            Hook.__init__(self)
             self.scripts = []
 
         def beforeFile(self, *args, **kwargs):
@@ -108,6 +108,7 @@ def beforeFile(self, *args, **kwargs):
             'source_scripts': source_scripts,
             'binary_scripts': binary_scripts},
         options={BANGPATH_OPT: False})
+    value = value.replace('python3', sys.executable)
     print(value)