From df1279c26782719fb71363d08e0a1702d7ccedaf Mon Sep 17 00:00:00 2001 From: Marcel Hellkamp Date: Thu, 19 Dec 2019 17:07:15 +0100 Subject: Revert "fix #1186: Bottle fails to find templates on windows" This reverts commit 085f18615fe8ab63588eebfd25bb90337aac2ba0. --- bottle.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bottle.py b/bottle.py index 2d05421..f157ffc 100755 --- a/bottle.py +++ b/bottle.py @@ -2695,7 +2695,8 @@ class ResourceManager(object): res.add_path('./resources/', __file__) """ base = os.path.abspath(os.path.dirname(base or self.base)) - path = os.path.abspath(os.path.join(base, os.path.dirname(path))) + "/" + path = os.path.abspath(os.path.join(base, os.path.dirname(path))) + path += os.sep if path in self.path: self.path.remove(path) if create and not os.path.isdir(path): @@ -3837,7 +3838,7 @@ class BaseTemplate(object): "Refer to templates with names or paths relative to the lookup path.") for spath in lookup: - spath = os.path.abspath(spath) + "/" + spath = os.path.abspath(spath) + os.sep fname = os.path.abspath(os.path.join(spath, name)) if not fname.startswith(spath): continue if os.path.isfile(fname): return fname -- cgit v1.2.1