changing python to python3 and changing dict.iteritems() to python3 method

ConstantConstantin · ConstantConstantin · commit 13a4dba6a34e · 2024-04-12T16:39:55.000+02:00
diff --git a/.project b/.project
@@ -6,12 +6,12 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
+			<name>org.python3.pydev.PyDevBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
+		<nature>org.python3.pydev.pythonNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.pydevproject b/.pydevproject
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<pydev_pathproperty name="org.python3.pydev.PROJECT_SOURCE_PATH">
 <path>/rosjava_build_tools/src</path>
 </pydev_pathproperty>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python3.pydev.PYTHON_PROJECT_VERSION">python3 2.7</pydev_property>
+<pydev_property name="org.python3.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 </pydev_project>
diff --git a/env-hooks/15.rosjava.bash.em b/env-hooks/15.rosjava.bash.em
@@ -6,12 +6,6 @@ SCRIPT=@(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py
 SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py
 @[end if]@
 
-if command -v python 1>/dev/null; then PYTHON_EXECUTABLE=python
-elif command -v python3 1>/dev/null; then PYTHON_EXECUTABLE=python3
-elif command -v python2 1>/dev/null; then PYTHON_EXECUTABLE=python2
-else PYTHON_EXECUTABLE=python
-fi
-
-export ROS_MAVEN_PATH="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-path`"
-export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-deployment-repository`"
-export ROS_MAVEN_REPOSITORY="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-repository`"
+export ROS_MAVEN_PATH="`python3 ${SCRIPT} --maven-path`"
+export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`python3 ${SCRIPT} --maven-deployment-repository`"
+export ROS_MAVEN_REPOSITORY="`python3 ${SCRIPT} --maven-repository`"
diff --git a/env-hooks/15.rosjava.sh.em b/env-hooks/15.rosjava.sh.em
@@ -6,12 +6,6 @@ SCRIPT=@(CMAKE_CURRENT_SOURCE_DIR)/generate_environment_variables.py
 SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_variables.py
 @[end if]@
 
-if command -v python 1>/dev/null; then PYTHON_EXECUTABLE=python
-elif command -v python3 1>/dev/null; then PYTHON_EXECUTABLE=python3
-elif command -v python2 1>/dev/null; then PYTHON_EXECUTABLE=python2
-else PYTHON_EXECUTABLE=python
-fi
-
-export ROS_MAVEN_PATH="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-path`"
-export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-deployment-repository`"
-export ROS_MAVEN_REPOSITORY="`${PYTHON_EXECUTABLE} ${SCRIPT} --maven-repository`"
+export ROS_MAVEN_PATH="`python3 ${SCRIPT} --maven-path`"
+export ROS_MAVEN_DEPLOYMENT_REPOSITORY="`python3 ${SCRIPT} --maven-deployment-repository`"
+export ROS_MAVEN_REPOSITORY="`python3 ${SCRIPT} --maven-repository`"
diff --git a/generate_environment_variables.py b/generate_environment_variables.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import argparse
diff --git a/package.xml b/package.xml
@@ -19,7 +19,10 @@
   <buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
   <buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
 
-  <depend>ant</depend>
-  <depend>java</depend>
-  <exec_depend>catkin</exec_depend>
+  <build_depend>java</build_depend>
+  <build_depend>ant</build_depend>
+  <run_depend>java</run_depend>
+  <run_depend>ant</run_depend>
+  <run_depend>catkin</run_depend>
+  <run_depend>create-package</run_depend>
 </package>
diff --git a/scripts/catkin_create_android_library_project b/scripts/catkin_create_android_library_project
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """This script creates the skeleton of an android library package"""
 
diff --git a/scripts/catkin_create_android_pkg b/scripts/catkin_create_android_pkg
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """This script creates the skeleton of an android repo"""
 
diff --git a/scripts/catkin_create_android_project b/scripts/catkin_create_android_project
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """This script creates the skeleton of an android library package"""
 
diff --git a/scripts/catkin_create_rosjava_library_project b/scripts/catkin_create_rosjava_library_project
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """This script creates the skeleton of a rosjava library project"""
 
diff --git a/scripts/catkin_create_rosjava_pkg b/scripts/catkin_create_rosjava_pkg
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """This script creates the skeleton of a rosjava catkin package (typically an entire repo)"""
 
diff --git a/scripts/catkin_create_rosjava_project b/scripts/catkin_create_rosjava_project
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """This script creates the skeleton of a rosjava application project"""
 
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from setuptools import setup
 from catkin_pkg.python_setup import generate_distutils_setup
diff --git a/src/rosjava_build_tools/__init__.py b/src/rosjava_build_tools/__init__.py
@@ -1,13 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##############################################################################
 # Imports
 ##############################################################################
 
-from rosjava_build_tools import console
+
+import rosjava_build_tools.console as console
 from rosjava_build_tools.create_package import init_android_package, init_rosjava_package
-from rosjava_build_tools.create_android_project import create_android_project
+from rosjava_build_tools import create_android_project
+#from create_android_project import create_android_project
 from rosjava_build_tools.create_rosjava_project import create_rosjava_project, create_rosjava_msg_project, create_rosjava_library_project
 from rosjava_build_tools.utils import which
 from rosjava_build_tools.release import scrape_for_release_message_packages
-from rosjava_build_tools import catkin
+import rosjava_build_tools.catkin as catkin
diff --git a/src/rosjava_build_tools/catkin.py b/src/rosjava_build_tools/catkin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##############################################################################
 # Imports
@@ -40,7 +40,7 @@ def index_message_package_dependencies_from_local_environment(package_name_list=
       be used for sequencing builds of packages.
 
       @param package_name_list : sort dependencies for these packages only (defaults to all if empty)
-      @param package_paths : a python list of ros workspaces (defaults to ROS_PACKAGE_PATH if None is given)
+      @param package_paths : a python3 list of ros workspaces (defaults to ROS_PACKAGE_PATH if None is given)
       @return dict mapping relative path to a catkin_pkg.Package
     '''
     if package_paths is None:
diff --git a/src/rosjava_build_tools/console.py b/src/rosjava_build_tools/console.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##############################################################################
 # Imports
diff --git a/src/rosjava_build_tools/create_android_project.py b/src/rosjava_build_tools/create_android_project.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##############################################################################
 # Imports
@@ -11,14 +11,10 @@
 import argparse
 import subprocess
 import shutil
-try:
-    import exceptions
-except ImportError:
-    import builtins as exceptions
 
 # local imports
-from rosjava_build_tools import utils
-from rosjava_build_tools import console
+import rosjava_build_tools.utils as utils
+import rosjava_build_tools.console as console
 
 ##############################################################################
 # Methods
@@ -50,6 +46,7 @@ def parse_arguments():
     return args
 
 
+
 def actually_create_android_project(package_name, target_version, java_package_name, is_library):
     path = os.path.join(os.getcwd(), package_name.lower())
     console.pretty_println("\nCreating android project ", console.bold)
@@ -75,9 +72,9 @@ def actually_create_android_project(package_name, target_version, java_package_n
     except subprocess.CalledProcessError:
         print("Error")
         raise subprocess.CalledProcessError("failed to create android project.")
-    except exceptions.OSError as e:
+    except OSError as e:
         print("OS error" + str(e))
-        raise exceptions.OSError()
+        raise OSError()
 
     # This is in the old form, let's shovel the shit around to the new form
     utils.mkdir_p(os.path.join(path, 'src', 'main', 'java'))
diff --git a/src/rosjava_build_tools/create_package.py b/src/rosjava_build_tools/create_package.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##############################################################################
 # Imports
@@ -12,8 +12,13 @@
 from catkin_pkg.package_templates import create_package_xml, PackageTemplate
 
 # local imports
+<<<<<<< HEAD
 from rosjava_build_tools import utils
 from rosjava_build_tools import console
+=======
+import rosjava_build_tools.utils as utils
+import rosjava_build_tools.console as console
+>>>>>>> changing python to python3 and changing dict.iteritems() to python3 method
 
 ##############################################################################
 # Methods
diff --git a/src/rosjava_build_tools/create_rosjava_project.py b/src/rosjava_build_tools/create_rosjava_project.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##############################################################################
 # Imports
@@ -13,8 +13,8 @@
 import xml.etree.ElementTree as ElementTree
 
 # local imports
-from rosjava_build_tools import utils
-from rosjava_build_tools import console
+import rosjava_build_tools.utils as utils
+import rosjava_build_tools.console as console
 
 ##############################################################################
 # Methods
diff --git a/src/rosjava_build_tools/release.py b/src/rosjava_build_tools/release.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##############################################################################
 # Imports
diff --git a/src/rosjava_build_tools/utils.py b/src/rosjava_build_tools/utils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 ##############################################################################
 # Imports
@@ -8,7 +8,11 @@
 import sys
 import errno
 import pwd
+<<<<<<< HEAD
 from rosjava_build_tools import console
+=======
+import rosjava_build_tools.console as console
+>>>>>>> changing python to python3 and changing dict.iteritems() to python3 method
 
 ##############################################################################
 # Methods
@@ -18,7 +22,7 @@
 def distro_version():
     '''
       This code is pulled from rosversion, which unfortunately has it buried inside
-      the script, not in the python module.
+      the script, not in the python3 module.
     '''
     if 'ROS_DISTRO' in os.environ:
         return os.environ['ROS_DISTRO']
@@ -81,7 +85,7 @@ def author_name():
 
 def mkdir_p(path):
     '''
-      Enables mkdir -p functionality (until python 3.2 is able to use
+      Enables mkdir -p functionality (until python3 3.2 is able to use
       the mode argument to do the same).
     '''
     try:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python3`
`2`	`2`
`3`	`3`	`import os`
`4`	`4`	`import argparse`