summaryrefslogtreecommitdiffstats
path: root/ipsilon
diff options
context:
space:
mode:
Diffstat (limited to 'ipsilon')
-rwxr-xr-xipsilon/install/ipsilon-client-install2
-rwxr-xr-xipsilon/install/ipsilon-server-install2
-rw-r--r--ipsilon/providers/saml2/rest.py2
-rw-r--r--ipsilon/util/data.py2
-rw-r--r--ipsilon/util/policy.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/ipsilon/install/ipsilon-client-install b/ipsilon/install/ipsilon-client-install
index 452c7e0..2c6df8e 100755
--- a/ipsilon/install/ipsilon-client-install
+++ b/ipsilon/install/ipsilon-client-install
@@ -281,7 +281,7 @@ def parse_config_profile(args):
if g in globals():
globals()[g] = val
else:
- for k in globals().keys():
+ for k in globals():
if k.lower() == g.lower():
globals()[k] = val
break
diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install
index 6c7c6dd..80bd274 100755
--- a/ipsilon/install/ipsilon-server-install
+++ b/ipsilon/install/ipsilon-server-install
@@ -313,7 +313,7 @@ def parse_config_profile(args):
if g in globals():
globals()[g] = val
else:
- for k in globals().keys():
+ for k in globals():
if k.lower() == g.lower():
globals()[k] = val
break
diff --git a/ipsilon/providers/saml2/rest.py b/ipsilon/providers/saml2/rest.py
index 6887ba8..c332bf9 100644
--- a/ipsilon/providers/saml2/rest.py
+++ b/ipsilon/providers/saml2/rest.py
@@ -70,7 +70,7 @@ class SPS(RestProviderBase):
else:
data = idp.get_data()
- for idval in data.keys():
+ for idval in data:
result = dict(provider=data[idval].get('name'),
metadata=data[idval].get('metadata'),)
results.append(result)
diff --git a/ipsilon/util/data.py b/ipsilon/util/data.py
index e0cd6e1..3c116bb 100644
--- a/ipsilon/util/data.py
+++ b/ipsilon/util/data.py
@@ -23,7 +23,7 @@ class SqlStore(Log):
@classmethod
def get_connection(cls, name):
- if name not in cls.__instances.keys():
+ if name not in cls.__instances:
if cherrypy.config.get('db.conn.log', False):
logging.debug('SqlStore new: %s', name)
cls.__instances[name] = SqlStore(name)
diff --git a/ipsilon/util/policy.py b/ipsilon/util/policy.py
index 8f70673..f1915cc 100644
--- a/ipsilon/util/policy.py
+++ b/ipsilon/util/policy.py
@@ -77,7 +77,7 @@ class Policy(Log):
# If ignore_case is True,
# then PD translates case insensitively prefixes
PD = dict()
- for k in attributes.keys():
+ for k in attributes:
if ignore_case:
# note duplicates that differ only by case
# will be lost here, beware!