From 524bf631fded88249ace08e0606cb0538bc1da33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leroy=20R=C3=BCgemer?= <lruegeme@techfak.uni-bielefeld.de> Date: Thu, 19 Sep 2019 09:25:38 +0200 Subject: [PATCH] make scripts python3 compatible --- generate_environment_variables.py | 4 +++- src/rosjava_build_tools/__init__.py | 14 +++++++------- src/rosjava_build_tools/create_android_project.py | 4 ++-- src/rosjava_build_tools/create_package.py | 4 ++-- src/rosjava_build_tools/create_rosjava_project.py | 4 ++-- src/rosjava_build_tools/release.py | 2 +- src/rosjava_build_tools/utils.py | 2 +- 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/generate_environment_variables.py b/generate_environment_variables.py index dbe317e..94a36b3 100755 --- a/generate_environment_variables.py +++ b/generate_environment_variables.py @@ -2,6 +2,7 @@ import os import argparse +import codecs CATKIN_MARKER_FILE = '.catkin' @@ -142,6 +143,7 @@ if __name__ == '__main__': home = os.path.join(workspaces[0], 'share', 'maven') print(home) elif args.create_maven_settings: - print((MAVEN_HEADER + get_repositories_xml() + MAVEN_FOOTER).encode('string_escape')) + s = (MAVEN_HEADER + get_repositories_xml() + MAVEN_FOOTER) + print(repr(s)[1:-1].replace("'", "\\'")) else: print("Nothing to see here - please provide one of the valid command switches.") diff --git a/src/rosjava_build_tools/__init__.py b/src/rosjava_build_tools/__init__.py index 827706b..e83f4da 100644 --- a/src/rosjava_build_tools/__init__.py +++ b/src/rosjava_build_tools/__init__.py @@ -4,10 +4,10 @@ # Imports ############################################################################## -import console -from create_package import init_android_package, init_rosjava_package -from create_android_project import create_android_project -from create_rosjava_project import create_rosjava_project, create_rosjava_msg_project, create_rosjava_library_project -from utils import which -from release import scrape_for_release_message_packages -import catkin +from rosjava_build_tools import 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.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 diff --git a/src/rosjava_build_tools/create_android_project.py b/src/rosjava_build_tools/create_android_project.py index d31d2dc..7662ca3 100644 --- a/src/rosjava_build_tools/create_android_project.py +++ b/src/rosjava_build_tools/create_android_project.py @@ -13,8 +13,8 @@ import subprocess import shutil # local imports -import utils -import console +from rosjava_build_tools import utils +from rosjava_build_tools import console ############################################################################## # Methods diff --git a/src/rosjava_build_tools/create_package.py b/src/rosjava_build_tools/create_package.py index a5e19e8..b3ce6ce 100644 --- a/src/rosjava_build_tools/create_package.py +++ b/src/rosjava_build_tools/create_package.py @@ -12,8 +12,8 @@ import catkin_pkg from catkin_pkg.package_templates import create_package_xml, PackageTemplate # local imports -import utils -import console +from rosjava_build_tools import utils +from rosjava_build_tools import console ############################################################################## # Methods diff --git a/src/rosjava_build_tools/create_rosjava_project.py b/src/rosjava_build_tools/create_rosjava_project.py index 25e1b21..2c0ec19 100644 --- a/src/rosjava_build_tools/create_rosjava_project.py +++ b/src/rosjava_build_tools/create_rosjava_project.py @@ -13,8 +13,8 @@ import argparse import xml.etree.ElementTree as ElementTree # local imports -import utils -import console +from rosjava_build_tools import utils +from rosjava_build_tools import console ############################################################################## # Methods diff --git a/src/rosjava_build_tools/release.py b/src/rosjava_build_tools/release.py index 8b4435c..073f08d 100644 --- a/src/rosjava_build_tools/release.py +++ b/src/rosjava_build_tools/release.py @@ -6,7 +6,7 @@ import rosdistro import catkin_pkg -from . import catkin +from rosjava_build_tools import catkin ############################################################################## # Imports diff --git a/src/rosjava_build_tools/utils.py b/src/rosjava_build_tools/utils.py index 92a35ff..757a76e 100644 --- a/src/rosjava_build_tools/utils.py +++ b/src/rosjava_build_tools/utils.py @@ -8,7 +8,7 @@ import os import sys import errno import pwd -import console +from rosjava_build_tools import console ############################################################################## # Methods -- GitLab