[Calypso] [PATCH] Make sure data_path() doesn't end in a '/'

Guido G├╝nther agx at sigxcpu.org
Sun Jan 24 10:26:34 PST 2016


On Sun, Jan 24, 2016 at 04:39:41PM +0000, Jelmer Vernoo─│ wrote:
> On Sun, Jan 24, 2016 at 12:39:15PM +0100, Petter Reinholdtsen wrote:
> > 
> > A third patch from Guido:
> > 
> >   We expect the same form url_path() in is_collection() and end up in an
> >   endless loop otherwise.
> >     
> >   Found by caldav-testers CalDAV/get.xml
> > 
> > diff --git a/calypso/paths.py b/calypso/paths.py
> > index d69b667..fe72e91 100644
> > --- a/calypso/paths.py
> > +++ b/calypso/paths.py
> > @@ -43,7 +43,7 @@ def url_to_owner(path):
> >  #
> >  
> >  def data_root():
> > -    return os.path.expanduser(config.get("storage", "folder"))
> > +    return os.path.expanduser(config.get("storage", "folder")).rstrip('/')
> 
> LGTM

I wondered what the commit message meant since there is no url_path()
function so I cleaned that up a bit and pushed it.
Cheers,
 -- Guido


More information about the Calypso mailing list