Fix os.environ checks (python3 compat)

diff --git a/modules/config.py b/modules/config.py
index ee32dfac8bdc58c4bc3ad333b92a111f775d6527..0836555306566749e2534ec87de9ff363c2b1e54 100644 (file)
--- a/modules/config.py
+++ b/modules/config.py
@@ -4,7 +4,7 @@ import string, os
 
 value = {}
 
-if os.environ.has_key('HOME'):
+if 'HOME' in os.environ:
     path = os.environ['HOME']
 else:
     path = '../../' # cgi-bin interface

diff --git a/modules/ftpio.py b/modules/ftpio.py
index 5e0132b69ddf2596d6b43a74e058738927ea1089..2529cee2d9b5f7b1c39276e5f526c49af8d20239 100644 (file)
--- a/modules/ftpio.py
+++ b/modules/ftpio.py
@@ -8,7 +8,7 @@ import config
 
 pubsock=config.value['pubsock']
 
-if os.environ.has_key('HOME'):
+if 'HOME' in os.environ:
     privsock=os.environ['HOME']+'/pld-ftp-admin/var/privsock'
     socketname=privsock
 else:

diff --git a/modules/wwwiface.py b/modules/wwwiface.py
index 12b1a25a927ead5335ff28f0f4806d81e038afd0..4e65630728bb8481c5b2f2007ea3e741396e7899 100644 (file)
--- a/modules/wwwiface.py
+++ b/modules/wwwiface.py
@@ -30,7 +30,7 @@ def getopts():
 
     cookies = {}
 
-    if os.environ.has_key('HTTP_COOKIE'):
+    if 'HTTP_COOKIE' in os.environ:
         c = Cookie.SimpleCookie()
         c.load(os.environ['HTTP_COOKIE'])
         for key in c.keys():