Small pep8 related typo fixes
This commit is contained in:
parent
8f488eb6bc
commit
cdae6f04e9
@ -22,7 +22,7 @@
|
||||
# This file is just a script, allow [a-z0-9]* variable names
|
||||
# pylint: disable-msg=C0103
|
||||
|
||||
# ``import radicale`` refers to the ``radicale`` module, not ``radicale.py``
|
||||
# ``import radicale`` refers to the ``radicale`` module, not ``radicale.py``
|
||||
# pylint: disable-msg=W0406
|
||||
|
||||
"""
|
||||
@ -163,7 +163,7 @@ finally:
|
||||
|
||||
radicale.log.LOGGER.info("Stopping Radicale")
|
||||
|
||||
for server in servers:
|
||||
for server in servers:
|
||||
radicale.log.LOGGER.debug(
|
||||
"Closing server listening to %s port %s" % (
|
||||
server.server_name, server.server_port))
|
||||
|
@ -110,7 +110,7 @@ class Application(object):
|
||||
# pylint: disable=E0202
|
||||
@staticmethod
|
||||
def headers_log(environ):
|
||||
"""Remove environment variables from the headers for logging purpose."""
|
||||
"""Remove environment variables from the headers for logging."""
|
||||
request_environ = dict(environ)
|
||||
for shell_variable in os.environ:
|
||||
del request_environ[shell_variable]
|
||||
@ -315,7 +315,8 @@ class Application(object):
|
||||
def move(self, environ, calendars, content, user):
|
||||
"""Manage MOVE request."""
|
||||
from_calendar = calendars[0]
|
||||
from_name = xmlutils.name_from_path(environ["PATH_INFO"], from_calendar)
|
||||
from_name = xmlutils.name_from_path(
|
||||
environ["PATH_INFO"], from_calendar)
|
||||
if from_name:
|
||||
item = from_calendar.get_item(from_name)
|
||||
if item:
|
||||
@ -337,7 +338,6 @@ class Application(object):
|
||||
# Moving calendars, not supported
|
||||
return client.FORBIDDEN, {}, None
|
||||
|
||||
|
||||
def options(self, environ, calendars, content, user):
|
||||
"""Manage OPTIONS request."""
|
||||
headers = {
|
||||
@ -386,7 +386,7 @@ class Application(object):
|
||||
|
||||
def report(self, environ, calendars, content, user):
|
||||
"""Manage REPORT request."""
|
||||
# TODO: support multiple calendars here
|
||||
# TODO: support multiple calendars here
|
||||
calendar = calendars[0]
|
||||
headers = {'Content-Type': 'text/xml'}
|
||||
answer = xmlutils.report(environ["PATH_INFO"], content, calendar)
|
||||
|
@ -47,7 +47,8 @@ def has_right(owner, user, password):
|
||||
CONNEXION.simple_bind_s(BINDDN, PASSWORD)
|
||||
|
||||
distinguished_name = "%s=%s" % (ATTRIBUTE, ldap.dn.escape_dn_chars(user))
|
||||
log.LOGGER.debug("LDAP bind for %s in base %s" % (distinguished_name, BASE))
|
||||
log.LOGGER.debug(
|
||||
"LDAP bind for %s in base %s" % (distinguished_name, BASE))
|
||||
|
||||
users = CONNEXION.search_s(BASE, ldap.SCOPE_ONELEVEL, distinguished_name)
|
||||
if users:
|
||||
@ -61,6 +62,6 @@ def has_right(owner, user, password):
|
||||
return True
|
||||
else:
|
||||
log.LOGGER.debug("User %s not found" % user)
|
||||
|
||||
|
||||
log.LOGGER.debug("LDAP bind failed")
|
||||
return False
|
||||
|
@ -53,7 +53,7 @@ def _sha1(hash_value, password):
|
||||
"""Check if ``hash_value`` and ``password`` match using sha1 method."""
|
||||
hash_value = hash_value.replace("{SHA}", "").encode("ascii")
|
||||
password = password.encode(config.get("htpasswd_encoding", "stock"))
|
||||
sha1 = hashlib.sha1() # pylint: disable=E1101
|
||||
sha1 = hashlib.sha1() # pylint: disable=E1101
|
||||
sha1.update(password)
|
||||
return sha1.digest() == base64.b64decode(hash_value)
|
||||
|
||||
|
@ -35,9 +35,9 @@ from radicale import config
|
||||
LOGGER = logging.getLogger()
|
||||
FILENAME = os.path.expanduser(config.get("logging", "config"))
|
||||
|
||||
|
||||
def start():
|
||||
"""Start the logging according to the configuration."""
|
||||
|
||||
if os.path.exists(FILENAME):
|
||||
# Configuration taken from file
|
||||
logging.config.fileConfig(FILENAME)
|
||||
|
Loading…
Reference in New Issue
Block a user