cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge branch master

Browse source
This commit is contained in:
Helmut Merz 2011-12-11 14:21:39 +01:00
commit 15f622f373
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
browser/util.py
View file

@ -20,7 +20,7 @@
Utilities. Utilities.
""" """
import re import re, urllib
from zope.app.pagetemplate import ViewPageTemplateFile from zope.app.pagetemplate import ViewPageTemplateFile
from zope.app.publisher.browser.menu import BrowserMenu from zope.app.publisher.browser.menu import BrowserMenu
from zope.app.publisher.interfaces.browser import IBrowserSubMenuItem from zope.app.publisher.interfaces.browser import IBrowserSubMenuItem
@ -29,7 +29,6 @@ from zope.formlib.namedtemplate import NamedTemplateImplementation
pageform = NamedTemplateImplementation(ViewPageTemplateFile('pageform.pt')) pageform = NamedTemplateImplementation(ViewPageTemplateFile('pageform.pt'))
#dataform = NamedTemplateImplementation(ViewPageTemplateFile('dataform.pt'))
dataform = ViewPageTemplateFile('dataform.pt') dataform = ViewPageTemplateFile('dataform.pt')
concept_macros = NamedTemplateImplementation(ViewPageTemplateFile('concept_macros.pt')) concept_macros = NamedTemplateImplementation(ViewPageTemplateFile('concept_macros.pt'))
@ -66,7 +65,7 @@ def html_quote(text, character_entities=((u'&', u'&amp;'), (u'<', u'&lt;' ),
return text return text
pattern = re.compile(r'[ /\?\+%]') pattern = re.compile(r'[ /\?\+\|%]')
def normalizeForUrl(text): def normalizeForUrl(text):
return pattern.sub('-', text) return urllib.quote(pattern.sub('-', text).encode('UTF-8'))