Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

make scripts python3 compatible #45

Open
wants to merge 1 commit into
base: kinetic
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/rosjava_build_tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/rosjava_build_tools/create_android_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import exceptions

# local imports
import utils
import console
from rosjava_build_tools import utils
from rosjava_build_tools import console

##############################################################################
# Methods
Expand Down
4 changes: 2 additions & 2 deletions src/rosjava_build_tools/create_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
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
Expand Down
4 changes: 2 additions & 2 deletions src/rosjava_build_tools/create_rosjava_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
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
Expand Down
2 changes: 1 addition & 1 deletion src/rosjava_build_tools/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import rosdistro
import catkin_pkg
from . import catkin
from rosjava_build_tools import catkin

##############################################################################
# Imports
Expand Down
2 changes: 1 addition & 1 deletion src/rosjava_build_tools/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import sys
import errno
import pwd
import console
from rosjava_build_tools import console

##############################################################################
# Methods
Expand Down