| |
@@ -11,7 +11,6 @@
|
| |
from ipsilon.authz.common import AuthzProviderInstall
|
| |
from ipsilon.util.data import UserStore
|
| |
from ipsilon.tools import files, dbupgrade
|
| |
- import ConfigParser
|
| |
import argparse
|
| |
import cherrypy
|
| |
import json
|
| |
@@ -20,6 +19,8 @@
|
| |
import pwd
|
| |
import shutil
|
| |
import socket
|
| |
+ import six
|
| |
+ from six.moves import configparser
|
| |
import subprocess
|
| |
import sys
|
| |
import time
|
| |
@@ -35,10 +36,10 @@
|
| |
WSGI_SOCKET_PREFIX = None
|
| |
|
| |
|
| |
- class ConfigurationError(StandardError):
|
| |
+ class ConfigurationError(Exception):
|
| |
|
| |
def __init__(self, message):
|
| |
- StandardError.__init__(self, message)
|
| |
+ super(ConfigurationError, self).__init__(message)
|
| |
|
| |
|
| |
#Silence cherrypy logging to screen
|
| |
@@ -94,7 +95,7 @@
|
| |
if os.path.exists(idp_conf):
|
| |
shutil.move(idp_conf, '%s.backup.%s' % (idp_conf, now))
|
| |
if not os.path.exists(instance_conf):
|
| |
- os.makedirs(instance_conf, 0700)
|
| |
+ os.makedirs(instance_conf, 0o700)
|
| |
confopts = {'instance': args['instance'],
|
| |
'instanceurl': args['instanceurl'],
|
| |
'needs_mount': args.get('needs_mount'),
|
| |
@@ -150,12 +151,12 @@
|
| |
if not os.path.exists(args['httpd_conf']):
|
| |
os.symlink(idp_conf, args['httpd_conf'])
|
| |
if not os.path.exists(args['public_data_dir']):
|
| |
- os.makedirs(args['public_data_dir'], 0755)
|
| |
+ os.makedirs(args['public_data_dir'], 0o755)
|
| |
if not os.path.exists(args['wellknown_dir']):
|
| |
- os.makedirs(args['wellknown_dir'], 0755)
|
| |
+ os.makedirs(args['wellknown_dir'], 0o755)
|
| |
sessdir = os.path.join(args['data_dir'], 'sessions')
|
| |
if not os.path.exists(sessdir):
|
| |
- os.makedirs(sessdir, 0700)
|
| |
+ os.makedirs(sessdir, 0o700)
|
| |
data_conf = os.path.join(args['data_dir'], 'ipsilon.conf')
|
| |
if not os.path.exists(data_conf):
|
| |
os.symlink(ipsilon_conf, data_conf)
|
| |
@@ -265,10 +266,10 @@
|
| |
data_dir = os.path.join(DATADIR, args['instance'])
|
| |
|
| |
try:
|
| |
- tconf = ConfigParser.SafeConfigParser()
|
| |
+ tconf = configparser.SafeConfigParser()
|
| |
tconf.read(os.path.join(instance_conf, 'ipsilon.conf'))
|
| |
cache_dir = tconf.get('global', 'cache_dir')
|
| |
- except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
|
| |
+ except (configparser.NoOptionError, configparser.NoSectionError):
|
| |
cache_dir = None
|
| |
else:
|
| |
cache_dir = cache_dir.replace('"', '')
|
| |
@@ -351,7 +352,7 @@
|
| |
|
| |
|
| |
def parse_config_profile(args):
|
| |
- config = ConfigParser.RawConfigParser()
|
| |
+ config = configparser.RawConfigParser()
|
| |
files = config.read(args['config_profile'])
|
| |
if len(files) == 0:
|
| |
raise ConfigurationError('Config Profile file %s not found!' %
|
| |
@@ -501,7 +502,7 @@
|
| |
opts = parse_args(fplugins)
|
| |
|
| |
logger.debug('Installation arguments:')
|
| |
- for k in sorted(opts.iterkeys()):
|
| |
+ for k in sorted(six.iterkeys(opts)):
|
| |
logger.debug('%s: %s', k, opts[k])
|
| |
|
| |
if not opts['root_instance'] and opts['instance'] == 'root':
|
| |
pycodestyle-3
(frompython3-pycodestyle
) is the actively maintained fork ofpep8
.