diff options
author | Marcel Hellkamp <marc@gsites.de> | 2019-12-19 17:07:15 +0100 |
---|---|---|
committer | Marcel Hellkamp <marc@gsites.de> | 2019-12-20 16:16:53 +0100 |
commit | 8561ffbc2ed2b16b4f7f90520d148e37e251d107 (patch) | |
tree | e56f84b2d436fd8ab6f472cf4d33790efb36c2bf | |
parent | 48e9dfef69d94d1acabb46cd6976acfcc214377b (diff) | |
download | bottle-8561ffbc2ed2b16b4f7f90520d148e37e251d107.tar.gz |
Revert "fix #1186: Bottle fails to find templates on windows"
This reverts commit 085f18615fe8ab63588eebfd25bb90337aac2ba0.
-rwxr-xr-x | bottle.py | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -2691,7 +2691,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): @@ -3840,7 +3841,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 |