Merge branch 'master' of git://gitorious.org/radicale/radicale

Conflicts:
	config
	radicale/__init__.py
	radicale/config.py
	radicale/log.py

radicale/acl/__init__.py

@@ -31,5 +31,9 @@ from radicale import config
 
 def load():
     """Load list of available ACL managers."""
-    module = __import__("radicale.acl", fromlist=[config.get("acl", "type")])
-    return getattr(module, config.get("acl", "type"))
+    acl_type = config.get("acl", "type")
+    if acl_type == "None":
+        return None
+    else:
+        module = __import__("radicale.acl", fromlist=[acl_type])
+        return getattr(module, acl_type)

radicale/acl/fake.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of Radicale Server - Calendar Server
-# Copyright © 2008-2011 Guillaume Ayoub
-# Copyright © 2008 Nicolas Kandel
-# Copyright © 2008 Pascal Halter
-#
-# This library is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Radicale.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-Fake ACL.
-
-No rights management.
-
-"""
-
-def has_right(*_):
-    """Check if ``user``/``password`` couple is valid."""
-    return True