From 45003cff74ba6540d1957776129453948d8065c3 Mon Sep 17 00:00:00 2001
From: Alistair Bush <ali_bush@gentoo.org>
Date: Fri, 25 Dec 2009 22:27:54 +0000
Subject: Apply python3 patch 4 from Arfrever

svn path=/projects/java-config-2/trunk/; revision=8039
---
 src/depend-java-query               | 1 -
 src/gjl                             | 1 -
 src/java_config_2/VM.py             | 5 ++---
 src/java_config_2/VersionManager.py | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/depend-java-query b/src/depend-java-query
index f47e92c..475728f 100755
--- a/src/depend-java-query
+++ b/src/depend-java-query
@@ -14,7 +14,6 @@ from java_config_2.VersionManager import *
 import os
 import sys
 from commands import getoutput
-from string import join
 
 from optparse import OptionParser, make_option, OptionValueError
 
diff --git a/src/gjl b/src/gjl
index e79b752..30ee1ea 100755
--- a/src/gjl
+++ b/src/gjl
@@ -11,7 +11,6 @@ from java_config_2.EnvironmentManager import *
 from java_config_2.VersionManager import *
 
 from commands import getoutput
-from string import join
 from optparse import OptionParser, make_option, OptionValueError
 import os
 from os.path import basename
diff --git a/src/java_config_2/VM.py b/src/java_config_2/VM.py
index d9af9fc..23ec0f5 100644
--- a/src/java_config_2/VM.py
+++ b/src/java_config_2/VM.py
@@ -8,7 +8,6 @@
 from FileParser import *
 from Errors import *
 import os
-from string import upper
 
 
 class VM:
@@ -46,7 +45,7 @@ class VM:
 
     def is_build_only(self):
         try:
-            if upper(self.query('BUILD_ONLY')) == 'TRUE':
+            if self.query('BUILD_ONLY').upper() == 'TRUE':
                 return True
         except:
             return False
@@ -58,7 +57,7 @@ class VM:
         return self.is_type("JDK")
 
     def is_type(self, type):
-        if upper(type) in [upper(t) for t in self.query('PROVIDES_TYPE').split(' ')]:
+        if type.upper() in [t.upper() for t in self.query('PROVIDES_TYPE').split(' ')]:
             return True
         else:
             return False
diff --git a/src/java_config_2/VersionManager.py b/src/java_config_2/VersionManager.py
index 6a9c08f..8c437ee 100644
--- a/src/java_config_2/VersionManager.py
+++ b/src/java_config_2/VersionManager.py
@@ -8,7 +8,6 @@ import sys
 sys.path.append("/usr/lib/portage/pym")
 
 import re
-from string import upper
 
 import VM, Errors 
 from java_config_2.FileParser import *
-- 
cgit v1.2.3-65-gdbad