Browse Source

Merge pull request #150 from joshgerdes/master

Added encoding safe list config value
main
Lakshmi Vyas 11 years ago
parent
commit
ef71d2457f
2 changed files with 8 additions and 0 deletions
  1. +1
    -0
      hyde/model.py
  2. +7
    -0
      hyde/site.py

+ 1
- 0
hyde/model.py View File

@@ -155,6 +155,7 @@ class Config(Expando):
layout_root='layout', layout_root='layout',
media_url='/media', media_url='/media',
base_url="/", base_url="/",
encode_safe=None,
not_found='404.html', not_found='404.html',
plugins = [], plugins = [],
ignore = [ "*~", "*.bak", ".hg", ".git", ".svn"], ignore = [ "*~", "*.bak", ".hg", ".git", ".svn"],


+ 7
- 0
hyde/site.py View File

@@ -435,6 +435,8 @@ class Site(object):
.replace(os.sep, '/').encode("utf-8") .replace(os.sep, '/').encode("utf-8")
if safe is not None: if safe is not None:
return quote(fpath, safe) return quote(fpath, safe)
elif self.config.encode_safe is not None:
return quote(fpath, self.config.encode_safe)
else: else:
return quote(fpath) return quote(fpath)


@@ -448,6 +450,8 @@ class Site(object):
.replace(os.sep, '/').encode("utf-8") .replace(os.sep, '/').encode("utf-8")
if safe is not None: if safe is not None:
return quote(fpath, safe) return quote(fpath, safe)
elif self.config.encode_safe is not None:
return quote(fpath, self.config.encode_safe)
else: else:
return quote(fpath) return quote(fpath)


@@ -457,6 +461,9 @@ class Site(object):
configuration and returns the appropriate url. The return value configuration and returns the appropriate url. The return value
is url encoded. is url encoded.
""" """
if safe is None and self.config.encode_safe is not None:
safe = self.config.encode_safe
if urlparse.urlparse(path)[:2] != ("",""): if urlparse.urlparse(path)[:2] != ("",""):
return path return path
if self.is_media(path): if self.is_media(path):


Loading…
Cancel
Save