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

Commit acd088d

Browse files
committed
Merge pull request #19 from bchretien/master
Fix Python2/Python3 clash.
2 parents c6deb91 + 970fadb commit acd088d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

generate_environment_variables.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def get_environment_variable(environ, key):
3434
except KeyError:
3535
pass
3636
if var == '':
37-
var = None
37+
var = None
3838
return var
3939

4040
if __name__ == '__main__':
@@ -48,12 +48,12 @@ def get_environment_variable(environ, key):
4848
else:
4949
if repo in [os.path.join(w, 'share', 'maven') for w in workspaces]:
5050
repo = os.path.join(workspaces[0], 'share', 'maven')
51-
print repo
51+
print(repo)
5252
elif args.maven_repository:
5353
repo = get_environment_variable(environment_variables, 'ROS_MAVEN_REPOSITORY')
5454
if repo is None:
5555
repo = 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
56-
print repo
56+
print(repo)
5757
elif args.maven_path:
5858
new_maven_paths = [os.path.join(path, 'share', 'maven') for path in workspaces]
5959
maven_paths = get_environment_variable(environment_variables, 'ROS_MAVEN_PATH')
@@ -64,14 +64,14 @@ def get_environment_variable(environ, key):
6464
common_paths = [p for p in maven_paths if p in new_maven_paths]
6565
if common_paths:
6666
maven_paths = new_maven_paths
67-
print os.pathsep.join(maven_paths)
67+
print(os.pathsep.join(maven_paths))
6868
elif args.gradle_user_home:
6969
home = get_environment_variable(environment_variables, 'GRADLE_USER_HOME')
7070
if home is None:
7171
home = os.path.join(workspaces[0], 'share', 'gradle')
7272
else:
7373
if home in [os.path.join(w, 'share', 'gradle') for w in workspaces]:
7474
home = os.path.join(workspaces[0], 'share', 'gradle')
75-
print home
75+
print(home)
7676
else:
77-
print "Nothing to see here - please provide one of the valid command switches."
77+
print("Nothing to see here - please provide one of the valid command switches.")

0 commit comments

Comments
 (0)