Apply python3 patch 1 from Arfrever

svn path=/projects/java-config-2/trunk/; revision=8036

6 files changed, 18 insertions, 18 deletions

diff --git a/src/java_config_2/EnvironmentManager.py b/src/java_config_2/EnvironmentManager.py
index 6ba7738..aed5859 100644
--- a/src/java_config_2/EnvironmentManager.py
+++ b/src/java_config_2/EnvironmentManager.py
@@ -364,7 +364,7 @@ class EnvironmentManager(object):
             for var in env_vars.split(' '):
                 val = pkg.query(var)
                 assert val
-                if (not env.has_key(var)):
+                if (var not in env):
                     env[var] = val
 
     def build_dep_env_vars(self, pkgs, missing_deps):
diff --git a/src/java_config_2/FileParser.py b/src/java_config_2/FileParser.py
index 77e28b0..04943b0 100644
--- a/src/java_config_2/FileParser.py
+++ b/src/java_config_2/FileParser.py
@@ -38,7 +38,7 @@ class FileParser:
                 while value.find('${') >= 0:
                     item = value[value.find('${')+2:value.find('}')]
 
-                    if self.config.has_key(item):
+                    if item in self.config:
                         val = self.config[item]
                     else:
                         val = ''
diff --git a/src/java_config_2/OutputFormatter.py b/src/java_config_2/OutputFormatter.py
index e79978a..57e267e 100644
--- a/src/java_config_2/OutputFormatter.py
+++ b/src/java_config_2/OutputFormatter.py
@@ -32,7 +32,7 @@ class OutputFormatter:
         self.consoleTitle = displayTitle
         self.autoIndent = autoIndent
 
-        if displayTitle and os.environ.has_key("TERM"):
+        if displayTitle and "TERM" in os.environ:
             if os.environ["TERM"] not in [ "xterm", "Eterm", "aterm", "rxvt" ]:
                 self.consoleTitle = False
 
@@ -43,7 +43,7 @@ class OutputFormatter:
         self.colorOutput = status
 
     def setDisplayTitleStatus(self, status):
-        if status and os.environ.has_key("TERM"):
+        if status and "TERM" in os.environ:
             if os.environ["TERM"] in [ "xterm", "Eterm", "aterm", "rxvt" ]:
                 self.consoleTitle = True
             else:
diff --git a/src/java_config_2/Package.py b/src/java_config_2/Package.py
index 2090306..9d7a4a8 100644
--- a/src/java_config_2/Package.py
+++ b/src/java_config_2/Package.py
@@ -28,7 +28,7 @@ class Package:
         return self._file
 
     def description(self):
-        if self._config.has_key("DESCRIPTION"):
+        if "DESCRIPTION" in self._config:
             return self._config["DESCRIPTION"]
         else:
             return "No Description"
@@ -37,7 +37,7 @@ class Package:
         """
         Returns this package's classpath
         """
-        if self._config.has_key("CLASSPATH"):
+        if "CLASSPATH" in self._config:
             return self._config["CLASSPATH"]
         else:
             return None
@@ -49,7 +49,7 @@ class Package:
         """
         Return the value of the requested var form the env file
         """
-        if self._config.has_key(var):
+        if var in self._config:
             return self._config[var]
         else:
             return None
diff --git a/src/java_config_2/VM.py b/src/java_config_2/VM.py
index d4da4a1..d9af9fc 100644
--- a/src/java_config_2/VM.py
+++ b/src/java_config_2/VM.py
@@ -20,7 +20,7 @@ class VM:
         self.config = EnvFileParser(file).get_config()
     
         for var in self.needed_vars:
-            if not self.config.has_key(var):
+            if var not in self.config:
                 raise InvalidVMError("Missing: %s" %var)
 
     def __cmp__(self, other):
@@ -33,7 +33,7 @@ class VM:
         return self.config
 
     def query(self, var):
-        if self.config.has_key(var):
+        if var in self.config:
             return self.config[var]
         else:
             raise EnvironmentUndefinedError
@@ -88,12 +88,12 @@ class VM:
         return None
 
     def get_provides(self):
-        if self.config.has_key('PROVIDES'):
+        if 'PROVIDES' in self.config:
             return self.config['PROVIDES'].split(' ')
         return []
 
     def provides(self, virtuals):
-        if self.config.has_key('PROVIDES'):
+        if 'PROVIDES' in self.config:
             vp = self.config['PROVIDES'].split(' ')
         else:
             return False
diff --git a/src/java_config_2/Virtual.py b/src/java_config_2/Virtual.py
index 872b940..3565662 100644
--- a/src/java_config_2/Virtual.py
+++ b/src/java_config_2/Virtual.py
@@ -36,10 +36,10 @@ class Virtual(Package):
         if self._file:
             self._config = EnvFileParser(file).get_config()
 
-            if self._config.has_key("PROVIDERS"):
+            if "PROVIDERS" in self._config:
                 self.providers = self._config["PROVIDERS"].split(' ')
 
-            if self._config.has_key("VM"):
+            if "VM" in self._config:
                 self.vm_providers = self._config["VM"].split(' ')
         else:
             self._config = {}
@@ -51,11 +51,11 @@ class Virtual(Package):
         # Now load system pref.  Really should support
         # List of packages instead of single package.
         all_prefs = self._manager.get_virtuals_pref().get_config()
-        if all_prefs.has_key(self.name()):
+        if self.name() in all_prefs:
             if all_prefs[self.name()] in temp_packages:
                 self._packages.append(all_prefs[self.name()])
         else:
-            if all_prefs.has_key('PREFER_UPSTREAM'):
+            if 'PREFER_UPSTREAM' in all_prefs:
                 for package in temp_packages:
                     if re.compile(all_prefs['PREFER_UPSTREAM'] + '*').match(package):
                         self._packages.append(package)
@@ -92,7 +92,7 @@ class Virtual(Package):
         return self._packages
 
     def use_all_available(self):
-        if self._config.has_key('MULTI_PROVIDER'):
+        if 'MULTI_PROVIDER' in self._config:
             return 'true' == self._config['MULTI_PROVIDER'].lower()
         return False
 
@@ -124,7 +124,7 @@ class Virtual(Package):
             except:
                 active_vm = self._manager.get_active_vm()
                 if active_vm and self.get_available_vms().count(active_vm.name()):
-                    if self._config.has_key("VM_CLASSPATH"):
+                    if "VM_CLASSPATH" in self._config:
                         return self._manager.get_active_vm().query('JAVA_HOME') + self._config["VM_CLASSPATH"]
                     #TODO figure out what is meant to happen here
                 else:
@@ -134,7 +134,7 @@ class Virtual(Package):
             if not self._manager.get_active_vm().name() in self._vms:
                 raise ProviderUnavailableError( self._name, ' '.join(self.vm_providers), ' '.join(self.providers) )
             
-            if self._config.has_key("VM_CLASSPATH"):
+            if "VM_CLASSPATH" in self._config:
                 cp += ':' + self._manager.get_active_vm().query('JAVA_HOME') + self._config["VM_CLASSPATH"]
             return cp