summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Rękorajski2021-01-16 19:48:57 (GMT)
committerJan Rękorajski2021-01-16 19:48:57 (GMT)
commit16b37c0d83e07e3008251e41dee9093ce92efa1a (patch)
tree441ab3c613ae9f30cd9537b87892aae49730b149
parent9c170c6153b10298811a5de004899f912d8b1e4d (diff)
downloadpld-ftp-admin-16b37c0d83e07e3008251e41dee9093ce92efa1a.zip
pld-ftp-admin-16b37c0d83e07e3008251e41dee9093ce92efa1a.tar.gz
Fix os.environ checks (python3 compat)
-rw-r--r--modules/config.py2
-rw-r--r--modules/ftpio.py2
-rw-r--r--modules/wwwiface.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/config.py b/modules/config.py
index ee32dfa..0836555 100644
--- 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 5e0132b..2529cee 100644
--- 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 12b1a25..4e65630 100644
--- 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():