tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75 from davidaurelio/master

Browse Source 
Fix python 3 problems with default rights
This commit is contained in:
Guillaume Ayoub 2013-10-29 03:16:09 -07:00
commit 830774824e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
radicale/rights.py
View File

@ -36,7 +36,6 @@ Leading or ending slashes are trimmed from collection's path.
"""
import re
import io
import os.path
from . import config, log
@ -47,6 +46,11 @@ try:
from configparser import ConfigParser
except ImportError:
from ConfigParser import ConfigParser
try:
from StringIO import StringIO
except ImportError:
from io import StringIO
# pylint: enable=F0401
@ -63,7 +67,7 @@ def _read_from_sections(user, collection, permission):
regex = ConfigParser({"login": user, "path": collection})
if rights_type in DEFINED_RIGHTS:
log.LOGGER.debug("Rights type '%s'" % rights_type)
regex.readfp(io.BytesIO(DEFINED_RIGHTS[rights_type]))
regex.readfp(StringIO(DEFINED_RIGHTS[rights_type]))
elif rights_type == "from_file":
log.LOGGER.debug("Reading rights from file %s" % filename)
if not regex.read(filename):