From a60f5c2ddcef0de63614e67a8a8560e1caaf765b Mon Sep 17 00:00:00 2001 From: Alistair Bush Date: Fri, 25 Dec 2009 22:26:57 +0000 Subject: Apply python3 patch 3 from Arfrever svn path=/projects/java-config-2/trunk/; revision=8038 --- src/gjl | 2 +- src/java-config-2 | 4 ++-- src/java_config_2/EnvironmentManager.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/gjl b/src/gjl index 06a930b..e79b752 100755 --- a/src/gjl +++ b/src/gjl @@ -273,7 +273,7 @@ if __name__ == '__main__': if args: print('gjl_args="%s";' % ( args )) env = get_env(pkg) - for k, v in env.iteritems(): + for k, v in env.items(): print('export %s="%s";' % ( k, v )) if options.jar: diff --git a/src/java-config-2 b/src/java-config-2 index 5920e98..dce094e 100755 --- a/src/java-config-2 +++ b/src/java-config-2 @@ -130,7 +130,7 @@ def exec_cmd(option, opt, value, parser): os.system(cmd) def list_available_packages(option, opt, value, parser): - for package in manager.get_packages().itervalues(): + for package in manager.get_packages().values(): printer._print("[%s] %s (%s)" % (package.name(), package.description(), package.file())) def list_available_vms(option, opt, value, parser): @@ -141,7 +141,7 @@ def list_available_vms(option, opt, value, parser): active = None printer._print('%HThe following VMs are available for generation-2:%$') - for i, vm in vm_list.iteritems(): + for i, vm in vm_list.items(): if vm is active: if not vm.is_build_only(): printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$')) diff --git a/src/java_config_2/EnvironmentManager.py b/src/java_config_2/EnvironmentManager.py index aed5859..2bb3604 100644 --- a/src/java_config_2/EnvironmentManager.py +++ b/src/java_config_2/EnvironmentManager.py @@ -134,7 +134,7 @@ class EnvironmentManager(object): def find_vm(self, name): found = [] - for id, vm in self.get_virtual_machines().iteritems(): + for id, vm in self.get_virtual_machines().items(): # match either exact given string or the unversioned part - bug #288695 if not name or len(name) == 0: found.append(vm) @@ -221,7 +221,7 @@ class EnvironmentManager(object): try: ENV_VARS = vm.query('ENV_VARS') - for (item, value) in vm.get_config().iteritems(): + for (item, value) in vm.get_config().items(): if item in ENV_VARS: stream.write(render % (item, value)) except IOError: -- cgit v1.2.3-65-gdbad