fix some errors in unused code

This commit is contained in:
kakwa 2017-01-31 20:59:49 +01:00
parent d7303da85f
commit e37b88dbda
4 changed files with 5 additions and 7 deletions

View File

@ -90,10 +90,10 @@ class PPolicyError(Exception):
class MissingMainFile(Exception): class MissingMainFile(Exception):
def __init__(self, config): def __init__(self, config):
self.rolefile = rolefile self.config = config
self.log = \ self.log = \
"fail to open main file '%(config)s'" % \ "fail to open main file '%(config)s'" % \
{'rolefile': rolefile} {'config': config}
class MissingAttributesFile(Exception): class MissingAttributesFile(Exception):

View File

@ -31,9 +31,9 @@ class PPolicy(ldapcherry.ppolicy.PPolicy):
def info(self): def info(self):
return \ return \
"* Minimum length: %(len)n\n" \ "* Minimum length: %(len)d\n" \
"* Minimum number of uppercase characters: %(upper)n\n" \ "* Minimum number of uppercase characters: %(upper)d\n" \
"* Minimum number of digits: %(digit)n" % { "* Minimum number of digits: %(digit)d" % {
'upper': self.min_upper, 'upper': self.min_upper,
'len': self.min_length, 'len': self.min_length,
'digit': self.min_digit 'digit': self.min_digit

View File

@ -8,7 +8,6 @@ import pytest
import sys import sys
from sets import Set from sets import Set
from ldapcherry.backend.backendLdap import Backend from ldapcherry.backend.backendLdap import Backend
from ldapcherry import syslog_error
from ldapcherry.exceptions import * from ldapcherry.exceptions import *
import cherrypy import cherrypy
import logging import logging

View File

@ -90,7 +90,6 @@ resources_files = get_list_files(
data_dir, data_dir,
) )
as_option_root
# add the configuration files if they don't exist # add the configuration files if they don't exist
if as_option_root() or not os.path.exists( if as_option_root() or not os.path.exists(
config_dir): config_dir):